From cadd5226dce3dd8df0417872deee9b66f59bf5d4 Mon Sep 17 00:00:00 2001 From: Sam Bent Date: Tue, 25 Jun 2019 11:12:01 -0700 Subject: [PATCH 001/227] Port test changes from .NET 4.8 --- .../test/Common/DRT/TestServices/DrtBaseInput.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseInput.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseInput.cs index 5f9304c70a8..85a54108f6a 100644 --- a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseInput.cs +++ b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseInput.cs @@ -371,6 +371,7 @@ internal class InternalNativeMethods public const int KEYEVENTF_UNICODE = 0x0004; public const int KEYEVENTF_SCANCODE = 0x0008; + public const int MOUSEEVENTF_MOVE_NOCOALESCE = 0x2000; public const int MOUSEEVENTF_VIRTUALDESK = 0x4000; public const int INPUT_MOUSE = 0; @@ -483,6 +484,12 @@ public static void SendMouseInput( double x, double y, int data, SendMouseInputF intflags |= InternalNativeMethods.MOUSEEVENTF_VIRTUALDESK; } + + // don't coalesce mouse moves - tests expect to see the results immediately + if ((intflags & (int)SendMouseInputFlags.Move) != 0) + { + intflags |= InternalNativeMethods.MOUSEEVENTF_MOVE_NOCOALESCE; + } InternalUnsafeNativeMethods.INPUT mi = new InternalUnsafeNativeMethods.INPUT(); mi.type = InternalNativeMethods.INPUT_MOUSE; @@ -495,6 +502,14 @@ public static void SendMouseInput( double x, double y, int data, SendMouseInputF //Console.WriteLine("Sending"); if ( InternalUnsafeNativeMethods.SendInput( 1, ref mi, Marshal.SizeOf( mi ) ) == 0 ) throw new Win32Exception( Marshal.GetLastWin32Error() ); + + if ((intflags & (int)SendMouseInputFlags.Wheel) != 0) + { + // MouseWheel input seems to be getting coalesced by the OS, similar to mouse-move. + // There isn't a NOCOALESCE flag to turn this off, so instead just sleep for + // a short time, hopefully enough to avoid the coalescing. + System.Threading.Thread.Sleep(50); + } } From 7809609b02ad3a7a7f11692bd6ad50d8fd9d89a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 01:03:22 +0000 Subject: [PATCH 002/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190626.19 (#1105) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19326.19 --- NuGet.config | 30 +++--- eng/Version.Details.xml | 222 +++++++++++++++++++-------------------- eng/Versions.props | 224 ++++++++++++++++++++-------------------- global.json | 48 ++++----- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index c0346aafa45..b3c69e7ae99 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2746d859a53..50b5c0be323 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,111 +1,111 @@ - - - - - https://github.com/dotnet/winforms - 9b0ec7bb6e82818a4ac80702a9cd5c45f5d2ffde - - - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/core-setup - e1d780539e85f4d8de263957715f9d08db2ceef4 - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 914f5f71a797720a04c0808e4dd3e50b1fb2f4b6 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b - - - https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b - - - https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - + + + + + https://github.com/dotnet/winforms + 9b0ec7bb6e82818a4ac80702a9cd5c45f5d2ffde + + + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/core-setup + e1d780539e85f4d8de263957715f9d08db2ceef4 + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int + 95335bdc0bbae81d9a378fe5a4b13c831d5a27c3 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/coreclr + 8974a699899bdc2cc5687504e1ada606ac803e9b + + + https://github.com/dotnet/coreclr + 8974a699899bdc2cc5687504e1ada606ac803e9b + + + https://github.com/dotnet/coreclr + 8974a699899bdc2cc5687504e1ada606ac803e9b + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + diff --git a/eng/Versions.props b/eng/Versions.props index 4a15a6d0777..60aa4077c89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,112 +1,112 @@ - - - - 4.8.0 - preview8 - 4.0.0.0 - 4.6.0-preview7.19320.1 - - - - 4.8.0-preview7.19325.3 - - - - 3.0.0-preview7.19323.2 - 3.0.0-preview7.19323.2 - 3.0.0-preview7.19323.2 - - - - 3.0.0-preview7-27824-03 - 3.0.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - - - - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview4.19176.11 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - - - - 1.0.0-beta.19326.2 - 1.0.0-beta.19326.2 - 1.0.0-beta.19326.2 - - - - 0.1.0-preview2-181205-2 - - - - 4.4.0 - - - - 15.9.20 - 15.9.20 - 2.4.0 - $(XUnitVersion) - $(XUnitVersion) - - 1.0.0-beta.19263.1 - - 5.28.1.1-1 - 0.0.0.1 - - - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - - - - - System.Reflection.MetadataLoadContext - Microsoft.Private.Winforms - System.Drawing.Common - System.DirectoryServices - Microsoft.DotNet.Wpf.DncEng - System.IO.Packaging - System.Reflection.MetadataLoadContext - - - - 4.8.0-preview7.19325.4 - - + + + + 4.8.0 + preview8 + 4.0.0.0 + 4.6.0-preview7.19320.1 + + + + 4.8.0-preview7.19325.3 + + + + 3.0.0-preview7.19323.2 + 3.0.0-preview7.19323.2 + 3.0.0-preview7.19323.2 + + + + 3.0.0-preview7-27824-03 + 3.0.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + + + + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview4.19176.11 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + + + + 1.0.0-beta.19326.2 + 1.0.0-beta.19326.2 + 1.0.0-beta.19326.2 + + + + 0.1.0-preview2-181205-2 + + + + 4.4.0 + + + + 15.9.20 + 15.9.20 + 2.4.0 + $(XUnitVersion) + $(XUnitVersion) + + 1.0.0-beta.19263.1 + + 5.28.1.1-1 + 0.0.0.1 + + + + $(RestoreSources); + https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json; + https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json; + https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json; + https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; + + + + + System.Reflection.MetadataLoadContext + Microsoft.Private.Winforms + System.Drawing.Common + System.DirectoryServices + Microsoft.DotNet.Wpf.DncEng + System.IO.Packaging + System.Reflection.MetadataLoadContext + + + + 4.8.0-preview8.19326.19 + + diff --git a/global.json b/global.json index 12a08128837..61df4b7e1f8 100644 --- a/global.json +++ b/global.json @@ -1,24 +1,24 @@ -{ - "tools": { - "dotnet": "3.0.100-preview7-012512", - "runtimes": { - "dotnet": [ - "2.1.7", - "$(MicrosoftNETCoreAppVersion)" - ] - }, - "vs": { - "version": "16.1" - } - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19326.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19326.2" - }, - "native-tools": { - "strawberry-perl": "5.28.1.1-1", - "net-framework-48-ref-assemblies": "0.0.0.1", - "dotnet-api-docs_netcoreapp3.0": "0.0.0.1", - "msvcurt-c1xx": "0.0.0.4" - } -} +{ + "tools": { + "dotnet": "3.0.100-preview7-012512", + "runtimes": { + "dotnet": [ + "2.1.7", + "$(MicrosoftNETCoreAppVersion)" + ] + }, + "vs": { + "version": "16.1" + } + }, + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19326.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19326.2" + }, + "native-tools": { + "strawberry-perl": "5.28.1.1-1", + "net-framework-48-ref-assemblies": "0.0.0.1", + "dotnet-api-docs_netcoreapp3.0": "0.0.0.1", + "msvcurt-c1xx": "0.0.0.4" + } +} From 0b073981642780180a7e3ff9bb498014d9350e55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 13:01:33 +0000 Subject: [PATCH 003/227] Update dependencies from https://github.com/dotnet/arcade build 20190627.39 (#1114) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19327.39 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19327.39 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19327.39 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19327.39 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19327.39 --- eng/Version.Details.xml | 20 +- eng/Versions.props | 6 +- eng/common/CIBuild.cmd | 2 +- eng/common/CheckSymbols.ps1 | 316 ++--- eng/common/PSScriptAnalyzerSettings.psd1 | 20 +- eng/common/PublishToPackageFeed.proj | 166 +-- eng/common/PublishToSymbolServers.proj | 164 +-- eng/common/README.md | 56 +- eng/common/SigningValidation.proj | 166 +-- eng/common/SourceLinkValidation.ps1 | 368 +++--- eng/common/build.ps1 | 282 ++-- eng/common/build.sh | 432 +++--- eng/common/cibuild.sh | 30 +- eng/common/cross/android/arm/toolchain.cmake | 82 +- .../cross/android/arm64/toolchain.cmake | 84 +- eng/common/cross/arm/sources.list.bionic | 22 +- eng/common/cross/arm/sources.list.jessie | 6 +- eng/common/cross/arm/sources.list.trusty | 20 +- eng/common/cross/arm/sources.list.xenial | 20 +- eng/common/cross/arm/sources.list.zesty | 22 +- eng/common/cross/arm/trusty-lttng-2.4.patch | 142 +- eng/common/cross/arm/trusty.patch | 194 +-- eng/common/cross/arm64/sources.list.bionic | 22 +- eng/common/cross/arm64/sources.list.buster | 22 +- eng/common/cross/arm64/sources.list.stretch | 24 +- eng/common/cross/arm64/sources.list.trusty | 20 +- eng/common/cross/arm64/sources.list.xenial | 20 +- eng/common/cross/arm64/sources.list.zesty | 22 +- eng/common/cross/armel/sources.list.jessie | 6 +- eng/common/cross/armel/tizen-build-rootfs.sh | 88 +- eng/common/cross/armel/tizen-fetch.sh | 342 ++--- eng/common/cross/armel/tizen/tizen-dotnet.ks | 100 +- eng/common/cross/armel/tizen/tizen.patch | 36 +- eng/common/cross/build-android-rootfs.sh | 274 ++-- eng/common/cross/build-rootfs.sh | 468 +++---- eng/common/cross/toolchain.cmake | 276 ++-- eng/common/cross/x86/sources.list.bionic | 22 +- eng/common/cross/x86/sources.list.trusty | 22 +- eng/common/cross/x86/sources.list.xenial | 22 +- eng/common/darc-init.ps1 | 66 +- eng/common/darc-init.sh | 128 +- eng/common/dotnet-install.cmd | 2 +- eng/common/dotnet-install.ps1 | 54 +- eng/common/dotnet-install.sh | 98 +- eng/common/generate-graph-files.ps1 | 172 +-- eng/common/helixpublish.proj | 52 +- eng/common/init-tools-native.cmd | 4 +- eng/common/init-tools-native.ps1 | 282 ++-- eng/common/init-tools-native.sh | 282 ++-- eng/common/internal-feed-operations.ps1 | 270 ++-- eng/common/internal-feed-operations.sh | 284 ++-- eng/common/internal/Directory.Build.props | 8 +- eng/common/internal/Tools.csproj | 54 +- eng/common/msbuild.ps1 | 52 +- eng/common/msbuild.sh | 116 +- eng/common/native/CommonLibrary.psm1 | 716 +++++----- eng/common/native/common-library.sh | 336 ++--- eng/common/native/install-cmake.sh | 232 ++-- eng/common/native/install-tool.ps1 | 260 ++-- eng/common/pipeline-logging-functions.ps1 | 464 +++---- eng/common/pipeline-logging-functions.sh | 204 +-- eng/common/post-build/dotnetsymbol-init.ps1 | 58 +- eng/common/post-build/nuget-validation.ps1 | 28 + eng/common/post-build/promote-build.ps1 | 53 + eng/common/post-build/sourcelink-cli-init.ps1 | 58 +- .../post-build/sourcelink-validation.ps1 | 448 +++---- eng/common/post-build/symbols-validation.ps1 | 372 +++--- .../post-build/trigger-subscriptions.ps1 | 69 + eng/common/sdk-task.ps1 | 158 +-- eng/common/sdl/NuGet.config | 26 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 194 +-- eng/common/sdl/extract-artifact-packages.ps1 | 70 + eng/common/sdl/init-sdl.ps1 | 94 +- eng/common/sdl/packages.config | 8 +- eng/common/sdl/push-gdn.ps1 | 100 +- eng/common/sdl/run-sdl.ps1 | 130 +- eng/common/templates/job/execute-sdl.yml | 98 +- .../templates/job/generate-graph-files.yml | 96 +- eng/common/templates/job/job.yml | 410 +++--- .../templates/job/publish-build-assets.yml | 168 +-- eng/common/templates/jobs/jobs.yml | 180 +-- eng/common/templates/phases/base.yml | 260 ++-- .../templates/phases/publish-build-assets.yml | 102 +- .../channels/internal-servicing.yml | 170 +++ .../channels/public-dev-release.yml | 328 ++--- .../post-build/channels/public-release.yml | 170 +++ .../channels/public-validation-release.yml | 234 ++-- .../templates/post-build/common-variables.yml | 36 +- .../templates/post-build/post-build.yml | 162 ++- .../templates/post-build/promote-build.yml | 51 +- .../post-build/setup-maestro-vars.yml | 70 +- .../post-build/trigger-subscription.yml | 11 + eng/common/templates/steps/build-reason.yml | 24 +- eng/common/templates/steps/run-on-unix.yml | 14 +- eng/common/templates/steps/run-on-windows.yml | 14 +- .../steps/run-script-ifequalelse.yml | 64 +- eng/common/templates/steps/send-to-helix.yml | 182 +-- eng/common/templates/steps/telemetry-end.yml | 204 +-- .../templates/steps/telemetry-start.yml | 482 +++---- eng/common/tools.ps1 | 1160 ++++++++--------- eng/common/tools.sh | 786 +++++------ global.json | 4 +- 102 files changed, 8247 insertions(+), 7641 deletions(-) create mode 100644 eng/common/post-build/nuget-validation.ps1 create mode 100644 eng/common/post-build/promote-build.ps1 create mode 100644 eng/common/post-build/trigger-subscriptions.ps1 create mode 100644 eng/common/sdl/extract-artifact-packages.ps1 create mode 100644 eng/common/templates/post-build/channels/internal-servicing.yml create mode 100644 eng/common/templates/post-build/channels/public-release.yml create mode 100644 eng/common/templates/post-build/trigger-subscription.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50b5c0be323..c43f98447d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + 247c0290c554a68dd3e560dd88fb0da26353d9d7 - + https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + 247c0290c554a68dd3e560dd88fb0da26353d9d7 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + 247c0290c554a68dd3e560dd88fb0da26353d9d7 - + https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + 247c0290c554a68dd3e560dd88fb0da26353d9d7 - + https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + 247c0290c554a68dd3e560dd88fb0da26353d9d7 diff --git a/eng/Versions.props b/eng/Versions.props index 60aa4077c89..48b489e4ce2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19326.2 - 1.0.0-beta.19326.2 - 1.0.0-beta.19326.2 + 1.0.0-beta.19327.39 + 1.0.0-beta.19327.39 + 1.0.0-beta.19327.39 diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd index 7fd3912c9b6..56c2f25ac22 100644 --- a/eng/common/CIBuild.cmd +++ b/eng/common/CIBuild.cmd @@ -1,2 +1,2 @@ -@echo off +@echo off powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" \ No newline at end of file diff --git a/eng/common/CheckSymbols.ps1 b/eng/common/CheckSymbols.ps1 index a7f6a8627fb..b8d84607b89 100644 --- a/eng/common/CheckSymbols.ps1 +++ b/eng/common/CheckSymbols.ps1 @@ -1,158 +1,158 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored - [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $SymbolToolPath # Full path to directory where dotnet symbol-tool was installed -) - -Add-Type -AssemblyName System.IO.Compression.FileSystem - -function FirstMatchingSymbolDescriptionOrDefault { - param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols - [string] $SymbolsPath - ) - - $FileName = [System.IO.Path]::GetFileName($FullPath) - $Extension = [System.IO.Path]::GetExtension($FullPath) - - # Those below are potential symbol files that the `dotnet symbol` might - # return. Which one will be returned depend on the type of file we are - # checking and which type of file was uploaded. - - # The file itself is returned - $SymbolPath = $SymbolsPath + "\" + $FileName - - # PDB file for the module - $PdbPath = $SymbolPath.Replace($Extension, ".pdb") - - # PDB file for R2R module (created by crossgen) - $NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb") - - # DBG file for a .so library - $SODbg = $SymbolPath.Replace($Extension, ".so.dbg") - - # DWARF file for a .dylib - $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") - - .\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null - - if (Test-Path $PdbPath) { - return "PDB" - } - elseif (Test-Path $NGenPdb) { - return "NGen PDB" - } - elseif (Test-Path $SODbg) { - return "DBG for SO" - } - elseif (Test-Path $DylibDwarf) { - return "Dwarf for Dylib" - } - elseif (Test-Path $SymbolPath) { - return "Module" - } - else { - return $null - } -} - -function CountMissingSymbols { - param( - [string] $PackagePath # Path to a NuGet package - ) - - # Ensure input file exist - if (!(Test-Path $PackagePath)) { - throw "Input file does not exist: $PackagePath" - } - - # Extensions for which we'll look for symbols - $RelevantExtensions = @(".dll", ".exe", ".so", ".dylib") - - # How many files are missing symbol information - $MissingSymbols = 0 - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $PackageGuid = New-Guid - $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid - $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols" - - [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath) - - # Makes easier to reference `symbol tool` - Push-Location $SymbolToolPath - - Get-ChildItem -Recurse $ExtractPath | - Where-Object {$RelevantExtensions -contains $_.Extension} | - ForEach-Object { - if ($_.FullName -Match "\\ref\\") { - Write-Host "`t Ignoring reference assembly file" $_.FullName - return - } - - $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath - $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath - - Write-Host -NoNewLine "`t Checking file" $_.FullName "... " - - if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { - Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")" - } - else { - $MissingSymbols++ - - if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { - Write-Host "No symbols found on MSDL or SymWeb!" - } - else { - if ($SymbolsOnMSDL -eq $null) { - Write-Host "No symbols found on MSDL!" - } - else { - Write-Host "No symbols found on SymWeb!" - } - } - } - } - - Pop-Location - - return $MissingSymbols -} - -function CheckSymbolsAvailable { - if (Test-Path $ExtractPath) { - Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue - } - - Get-ChildItem "$InputPath\*.nupkg" | - ForEach-Object { - $FileName = $_.Name - - # These packages from Arcade-Services include some native libraries that - # our current symbol uploader can't handle. Below is a workaround until - # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted. - if ($FileName -Match "Microsoft\.DotNet\.Darc\.") { - Write-Host "Ignoring Arcade-services file: $FileName" - Write-Host - return - } - elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") { - Write-Host "Ignoring Arcade-services file: $FileName" - Write-Host - return - } - - Write-Host "Validating $FileName " - $Status = CountMissingSymbols "$InputPath\$FileName" - - if ($Status -ne 0) { - Write-Error "Missing symbols for $Status modules in the package $FileName" - } - - Write-Host - } -} - -CheckSymbolsAvailable +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored + [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory=$true)][string] $SymbolToolPath # Full path to directory where dotnet symbol-tool was installed +) + +Add-Type -AssemblyName System.IO.Compression.FileSystem + +function FirstMatchingSymbolDescriptionOrDefault { + param( + [string] $FullPath, # Full path to the module that has to be checked + [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $SymbolsPath + ) + + $FileName = [System.IO.Path]::GetFileName($FullPath) + $Extension = [System.IO.Path]::GetExtension($FullPath) + + # Those below are potential symbol files that the `dotnet symbol` might + # return. Which one will be returned depend on the type of file we are + # checking and which type of file was uploaded. + + # The file itself is returned + $SymbolPath = $SymbolsPath + "\" + $FileName + + # PDB file for the module + $PdbPath = $SymbolPath.Replace($Extension, ".pdb") + + # PDB file for R2R module (created by crossgen) + $NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb") + + # DBG file for a .so library + $SODbg = $SymbolPath.Replace($Extension, ".so.dbg") + + # DWARF file for a .dylib + $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") + + .\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null + + if (Test-Path $PdbPath) { + return "PDB" + } + elseif (Test-Path $NGenPdb) { + return "NGen PDB" + } + elseif (Test-Path $SODbg) { + return "DBG for SO" + } + elseif (Test-Path $DylibDwarf) { + return "Dwarf for Dylib" + } + elseif (Test-Path $SymbolPath) { + return "Module" + } + else { + return $null + } +} + +function CountMissingSymbols { + param( + [string] $PackagePath # Path to a NuGet package + ) + + # Ensure input file exist + if (!(Test-Path $PackagePath)) { + throw "Input file does not exist: $PackagePath" + } + + # Extensions for which we'll look for symbols + $RelevantExtensions = @(".dll", ".exe", ".so", ".dylib") + + # How many files are missing symbol information + $MissingSymbols = 0 + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $PackageGuid = New-Guid + $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid + $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols" + + [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath) + + # Makes easier to reference `symbol tool` + Push-Location $SymbolToolPath + + Get-ChildItem -Recurse $ExtractPath | + Where-Object {$RelevantExtensions -contains $_.Extension} | + ForEach-Object { + if ($_.FullName -Match "\\ref\\") { + Write-Host "`t Ignoring reference assembly file" $_.FullName + return + } + + $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath + $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath + + Write-Host -NoNewLine "`t Checking file" $_.FullName "... " + + if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { + Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")" + } + else { + $MissingSymbols++ + + if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { + Write-Host "No symbols found on MSDL or SymWeb!" + } + else { + if ($SymbolsOnMSDL -eq $null) { + Write-Host "No symbols found on MSDL!" + } + else { + Write-Host "No symbols found on SymWeb!" + } + } + } + } + + Pop-Location + + return $MissingSymbols +} + +function CheckSymbolsAvailable { + if (Test-Path $ExtractPath) { + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue + } + + Get-ChildItem "$InputPath\*.nupkg" | + ForEach-Object { + $FileName = $_.Name + + # These packages from Arcade-Services include some native libraries that + # our current symbol uploader can't handle. Below is a workaround until + # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted. + if ($FileName -Match "Microsoft\.DotNet\.Darc\.") { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + + Write-Host "Validating $FileName " + $Status = CountMissingSymbols "$InputPath\$FileName" + + if ($Status -ne 0) { + Write-Error "Missing symbols for $Status modules in the package $FileName" + } + + Write-Host + } +} + +CheckSymbolsAvailable diff --git a/eng/common/PSScriptAnalyzerSettings.psd1 b/eng/common/PSScriptAnalyzerSettings.psd1 index 7c0f6a411bf..4c1ea7c98ea 100644 --- a/eng/common/PSScriptAnalyzerSettings.psd1 +++ b/eng/common/PSScriptAnalyzerSettings.psd1 @@ -1,11 +1,11 @@ -@{ - IncludeRules=@('PSAvoidUsingCmdletAliases', - 'PSAvoidUsingWMICmdlet', - 'PSAvoidUsingPositionalParameters', - 'PSAvoidUsingInvokeExpression', - 'PSUseDeclaredVarsMoreThanAssignments', - 'PSUseCmdletCorrectly', - 'PSStandardDSCFunctionsInResource', - 'PSUseIdenticalMandatoryParametersForDSC', - 'PSUseIdenticalParametersForDSC') +@{ + IncludeRules=@('PSAvoidUsingCmdletAliases', + 'PSAvoidUsingWMICmdlet', + 'PSAvoidUsingPositionalParameters', + 'PSAvoidUsingInvokeExpression', + 'PSUseDeclaredVarsMoreThanAssignments', + 'PSUseCmdletCorrectly', + 'PSStandardDSCFunctionsInResource', + 'PSUseIdenticalMandatoryParametersForDSC', + 'PSUseIdenticalParametersForDSC') } \ No newline at end of file diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj index 2730713f307..a1b1333723e 100644 --- a/eng/common/PublishToPackageFeed.proj +++ b/eng/common/PublishToPackageFeed.proj @@ -1,83 +1,83 @@ - - - - - - netcoreapp2.1 - - - - - - - - - - - - - - - - - - - - - - - - - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - https://dotnetfeed.blob.core.windows.net/arcade-validation/index.json - https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json - https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json - https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json - https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json - https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json - https://dotnetfeed.blob.core.windows.net/dotnet-sdk/index.json - https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json - https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json - https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json - https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json - https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json - https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json - - - - - - - - - - - - + + + + + + netcoreapp2.1 + + + + + + + + + + + + + + + + + + + + + + + + + https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json + https://dotnetfeed.blob.core.windows.net/arcade-validation/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json + https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json + https://dotnetfeed.blob.core.windows.net/dotnet-sdk/index.json + https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json + https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json + https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json + https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json + https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json + + + + + + + + + + + + diff --git a/eng/common/PublishToSymbolServers.proj b/eng/common/PublishToSymbolServers.proj index 56c22ff63f3..5d55e312b01 100644 --- a/eng/common/PublishToSymbolServers.proj +++ b/eng/common/PublishToSymbolServers.proj @@ -1,82 +1,82 @@ - - - - - - netcoreapp2.1 - - - - - - - - - - - - - - - - 3650 - true - false - - - - - - - - - - - - - - - - - + + + + + + netcoreapp2.1 + + + + + + + + + + + + + + + + 3650 + true + false + + + + + + + + + + + + + + + + + diff --git a/eng/common/README.md b/eng/common/README.md index 61eb96ec87a..ff49c371527 100644 --- a/eng/common/README.md +++ b/eng/common/README.md @@ -1,28 +1,28 @@ -# Don't touch this folder - - uuuuuuuuuuuuuuuuuuuu - u" uuuuuuuuuuuuuuuuuu "u - u" u$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - $ $$$" ... "$... ...$" ... "$$$ ... "$$$ $ - $ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $ - $ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $ - $ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $ - $ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $ - $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$$$$$" u" - "u "$$$$$$$$$$$$$$$$$$$$" u" - "u """""""""""""""""" u" - """""""""""""""""""" - -!!! Changes made in this directory are subject to being overwritten by automation !!! - -The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first. +# Don't touch this folder + + uuuuuuuuuuuuuuuuuuuu + u" uuuuuuuuuuuuuuuuuu "u + u" u$$$$$$$$$$$$$$$$$$$$u "u + u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u + u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u + u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u + u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u + $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ + $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ + $ $$$" ... "$... ...$" ... "$$$ ... "$$$ $ + $ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $ + $ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $ + $ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $ + $ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $ + $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $ + "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" + "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" + "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u" + "u "$$$$$$$$$$$$$$$$$$$$$$$$" u" + "u "$$$$$$$$$$$$$$$$$$$$" u" + "u """""""""""""""""" u" + """""""""""""""""""" + +!!! Changes made in this directory are subject to being overwritten by automation !!! + +The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first. diff --git a/eng/common/SigningValidation.proj b/eng/common/SigningValidation.proj index 8791acee336..7045fb6fb9d 100644 --- a/eng/common/SigningValidation.proj +++ b/eng/common/SigningValidation.proj @@ -1,83 +1,83 @@ - - - - - - netcoreapp2.1 - - - - - - - - $(NuGetPackageRoot)Microsoft.DotNet.SignCheck\$(SignCheckVersion)\tools\Microsoft.DotNet.SignCheck.exe - - $(PackageBasePath) - signcheck.log - signcheck.errors.log - signcheck.exclusions.txt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + netcoreapp2.1 + + + + + + + + $(NuGetPackageRoot)Microsoft.DotNet.SignCheck\$(SignCheckVersion)\tools\Microsoft.DotNet.SignCheck.exe + + $(PackageBasePath) + signcheck.log + signcheck.errors.log + signcheck.exclusions.txt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/common/SourceLinkValidation.ps1 b/eng/common/SourceLinkValidation.ps1 index 8ba975e6915..cb2d28cb99e 100644 --- a/eng/common/SourceLinkValidation.ps1 +++ b/eng/common/SourceLinkValidation.ps1 @@ -1,184 +1,184 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where Symbols.NuGet packages to be checked are stored - [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $SourceLinkToolPath, # Full path to directory where dotnet SourceLink CLI was installed - [Parameter(Mandatory=$true)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade - [Parameter(Mandatory=$true)][string] $GHCommit # GitHub commit SHA used to build the packages -) - -# Cache/HashMap (File -> Exist flag) used to consult whether a file exist -# in the repository at a specific commit point. This is populated by inserting -# all files present in the repo at a specific commit point. -$global:RepoFiles = @{} - -$ValidatePackage = { - param( - [string] $PackagePath # Full path to a Symbols.NuGet package - ) - - # Ensure input file exist - if (!(Test-Path $PackagePath)) { - throw "Input file does not exist: $PackagePath" - } - - # Extensions for which we'll look for SourceLink information - # For now we'll only care about Portable & Embedded PDBs - $RelevantExtensions = @(".dll", ".exe", ".pdb") - - Write-Host -NoNewLine "Validating" ([System.IO.Path]::GetFileName($PackagePath)) "... " - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId - $FailedFiles = 0 - - Add-Type -AssemblyName System.IO.Compression.FileSystem - - [System.IO.Directory]::CreateDirectory($ExtractPath); - - $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) - - $zip.Entries | - Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | - ForEach-Object { - $FileName = $_.FullName - $Extension = [System.IO.Path]::GetExtension($_.Name) - $FakeName = -Join((New-Guid), $Extension) - $TargetFile = Join-Path -Path $ExtractPath -ChildPath $FakeName - - # We ignore resource DLLs - if ($FileName.EndsWith(".resources.dll")) { - return - } - - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) - - $ValidateFile = { - param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $RealPath, - [ref] $FailedFiles - ) - - # Makes easier to reference `sourcelink cli` - Push-Location $using:SourceLinkToolPath - - $SourceLinkInfos = .\sourcelink.exe print-urls $FullPath | Out-String - - if ($LASTEXITCODE -eq 0 -and -not ([string]::IsNullOrEmpty($SourceLinkInfos))) { - $NumFailedLinks = 0 - - # We only care about Http addresses - $Matches = (Select-String '(http[s]?)(:\/\/)([^\s,]+)' -Input $SourceLinkInfos -AllMatches).Matches - - if ($Matches.Count -ne 0) { - $Matches.Value | - ForEach-Object { - $Link = $_ - $CommitUrl = -Join("https://raw.githubusercontent.com/", $using:GHRepoName, "/", $using:GHCommit, "/") - $FilePath = $Link.Replace($CommitUrl, "") - $Status = 200 - $Cache = $using:RepoFiles - - if ( !($Cache.ContainsKey($FilePath)) ) { - try { - $Uri = $Link -as [System.URI] - - # Only GitHub links are valid - if ($Uri.AbsoluteURI -ne $null -and $Uri.Host -match "github") { - $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode - } - else { - $Status = 0 - } - } - catch { - $Status = 0 - } - } - - if ($Status -ne 200) { - if ($NumFailedLinks -eq 0) { - if ($FailedFiles.Value -eq 0) { - Write-Host - } - - Write-Host "`tFile $RealPath has broken links:" - } - - Write-Host "`t`tFailed to retrieve $Link" - - $NumFailedLinks++ - } - } - } - - if ($NumFailedLinks -ne 0) { - $FailedFiles.value++ - $global:LASTEXITCODE = 1 - } - } - - Pop-Location - } - - &$ValidateFile $TargetFile $FileName ([ref]$FailedFiles) - } - - $zip.Dispose() - - if ($FailedFiles -eq 0) { - Write-Host "Passed." - } -} - -function ValidateSourceLinkLinks { - if (!($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { - Write-Host "GHRepoName should be in the format /" - $global:LASTEXITCODE = 1 - return - } - - if (!($GHCommit -Match "^[0-9a-fA-F]{40}$")) { - Write-Host "GHCommit should be a 40 chars hexadecimal string" - $global:LASTEXITCODE = 1 - return - } - - $RepoTreeURL = -Join("https://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1") - $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript") - - try { - # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash - $Data = Invoke-WebRequest $RepoTreeURL | ConvertFrom-Json | Select-Object -ExpandProperty tree - - foreach ($file in $Data) { - $Extension = [System.IO.Path]::GetExtension($file.path) - - if ($CodeExtensions.Contains($Extension)) { - $RepoFiles[$file.path] = 1 - } - } - } - catch { - Write-Host "Problems downloading the list of files from the repo. Url used: $RepoTreeURL" - $global:LASTEXITCODE = 1 - return - } - - if (Test-Path $ExtractPath) { - Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue - } - - # Process each NuGet package in parallel - $Jobs = @() - Get-ChildItem "$InputPath\*.symbols.nupkg" | - ForEach-Object { - $Jobs += Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName - } - - foreach ($Job in $Jobs) { - Wait-Job -Id $Job.Id | Receive-Job - } -} - -Measure-Command { ValidateSourceLinkLinks } +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where Symbols.NuGet packages to be checked are stored + [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory=$true)][string] $SourceLinkToolPath, # Full path to directory where dotnet SourceLink CLI was installed + [Parameter(Mandatory=$true)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade + [Parameter(Mandatory=$true)][string] $GHCommit # GitHub commit SHA used to build the packages +) + +# Cache/HashMap (File -> Exist flag) used to consult whether a file exist +# in the repository at a specific commit point. This is populated by inserting +# all files present in the repo at a specific commit point. +$global:RepoFiles = @{} + +$ValidatePackage = { + param( + [string] $PackagePath # Full path to a Symbols.NuGet package + ) + + # Ensure input file exist + if (!(Test-Path $PackagePath)) { + throw "Input file does not exist: $PackagePath" + } + + # Extensions for which we'll look for SourceLink information + # For now we'll only care about Portable & Embedded PDBs + $RelevantExtensions = @(".dll", ".exe", ".pdb") + + Write-Host -NoNewLine "Validating" ([System.IO.Path]::GetFileName($PackagePath)) "... " + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId + $FailedFiles = 0 + + Add-Type -AssemblyName System.IO.Compression.FileSystem + + [System.IO.Directory]::CreateDirectory($ExtractPath); + + $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) + + $zip.Entries | + Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | + ForEach-Object { + $FileName = $_.FullName + $Extension = [System.IO.Path]::GetExtension($_.Name) + $FakeName = -Join((New-Guid), $Extension) + $TargetFile = Join-Path -Path $ExtractPath -ChildPath $FakeName + + # We ignore resource DLLs + if ($FileName.EndsWith(".resources.dll")) { + return + } + + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) + + $ValidateFile = { + param( + [string] $FullPath, # Full path to the module that has to be checked + [string] $RealPath, + [ref] $FailedFiles + ) + + # Makes easier to reference `sourcelink cli` + Push-Location $using:SourceLinkToolPath + + $SourceLinkInfos = .\sourcelink.exe print-urls $FullPath | Out-String + + if ($LASTEXITCODE -eq 0 -and -not ([string]::IsNullOrEmpty($SourceLinkInfos))) { + $NumFailedLinks = 0 + + # We only care about Http addresses + $Matches = (Select-String '(http[s]?)(:\/\/)([^\s,]+)' -Input $SourceLinkInfos -AllMatches).Matches + + if ($Matches.Count -ne 0) { + $Matches.Value | + ForEach-Object { + $Link = $_ + $CommitUrl = -Join("https://raw.githubusercontent.com/", $using:GHRepoName, "/", $using:GHCommit, "/") + $FilePath = $Link.Replace($CommitUrl, "") + $Status = 200 + $Cache = $using:RepoFiles + + if ( !($Cache.ContainsKey($FilePath)) ) { + try { + $Uri = $Link -as [System.URI] + + # Only GitHub links are valid + if ($Uri.AbsoluteURI -ne $null -and $Uri.Host -match "github") { + $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode + } + else { + $Status = 0 + } + } + catch { + $Status = 0 + } + } + + if ($Status -ne 200) { + if ($NumFailedLinks -eq 0) { + if ($FailedFiles.Value -eq 0) { + Write-Host + } + + Write-Host "`tFile $RealPath has broken links:" + } + + Write-Host "`t`tFailed to retrieve $Link" + + $NumFailedLinks++ + } + } + } + + if ($NumFailedLinks -ne 0) { + $FailedFiles.value++ + $global:LASTEXITCODE = 1 + } + } + + Pop-Location + } + + &$ValidateFile $TargetFile $FileName ([ref]$FailedFiles) + } + + $zip.Dispose() + + if ($FailedFiles -eq 0) { + Write-Host "Passed." + } +} + +function ValidateSourceLinkLinks { + if (!($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { + Write-Host "GHRepoName should be in the format /" + $global:LASTEXITCODE = 1 + return + } + + if (!($GHCommit -Match "^[0-9a-fA-F]{40}$")) { + Write-Host "GHCommit should be a 40 chars hexadecimal string" + $global:LASTEXITCODE = 1 + return + } + + $RepoTreeURL = -Join("https://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1") + $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript") + + try { + # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash + $Data = Invoke-WebRequest $RepoTreeURL | ConvertFrom-Json | Select-Object -ExpandProperty tree + + foreach ($file in $Data) { + $Extension = [System.IO.Path]::GetExtension($file.path) + + if ($CodeExtensions.Contains($Extension)) { + $RepoFiles[$file.path] = 1 + } + } + } + catch { + Write-Host "Problems downloading the list of files from the repo. Url used: $RepoTreeURL" + $global:LASTEXITCODE = 1 + return + } + + if (Test-Path $ExtractPath) { + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue + } + + # Process each NuGet package in parallel + $Jobs = @() + Get-ChildItem "$InputPath\*.symbols.nupkg" | + ForEach-Object { + $Jobs += Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName + } + + foreach ($Job in $Jobs) { + Wait-Job -Id $Job.Id | Receive-Job + } +} + +Measure-Command { ValidateSourceLinkLinks } diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 75a7871a610..feb58d14191 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -1,141 +1,141 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string][Alias('c')]$configuration = "Debug", - [string]$platform = $null, - [string] $projects, - [string][Alias('v')]$verbosity = "minimal", - [string] $msbuildEngine = $null, - [bool] $warnAsError = $true, - [bool] $nodeReuse = $true, - [switch][Alias('r')]$restore, - [switch] $deployDeps, - [switch][Alias('b')]$build, - [switch] $rebuild, - [switch] $deploy, - [switch][Alias('t')]$test, - [switch] $integrationTest, - [switch] $performanceTest, - [switch] $sign, - [switch] $pack, - [switch] $publish, - [switch][Alias('bl')]$binaryLog, - [switch] $ci, - [switch] $prepareMachine, - [switch] $help, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties -) - -. $PSScriptRoot\tools.ps1 - -function Print-Usage() { - Write-Host "Common settings:" - Write-Host " -configuration Build configuration: 'Debug' or 'Release' (short: -c)" - Write-Host " -platform Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild" - Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" - Write-Host " -binaryLog Output binary log (short: -bl)" - Write-Host " -help Print help and exit" - Write-Host "" - - Write-Host "Actions:" - Write-Host " -restore Restore dependencies (short: -r)" - Write-Host " -build Build solution (short: -b)" - Write-Host " -rebuild Rebuild solution" - Write-Host " -deploy Deploy built VSIXes" - Write-Host " -deployDeps Deploy dependencies (e.g. VSIXes for integration tests)" - Write-Host " -test Run all unit tests in the solution (short: -t)" - Write-Host " -integrationTest Run all integration tests in the solution" - Write-Host " -performanceTest Run all performance tests in the solution" - Write-Host " -pack Package build outputs into NuGet packages and Willow components" - Write-Host " -sign Sign build outputs" - Write-Host " -publish Publish artifacts (e.g. symbols)" - Write-Host "" - - Write-Host "Advanced settings:" - Write-Host " -projects 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 " -prepareMachine Prepare machine for CI run, clean up processes after build" - Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" - Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." - Write-Host "" - - Write-Host "Command line arguments not listed above are passed thru to msbuild." - Write-Host "The above arguments can be shortened as much as to be unambiguous (e.g. -co for configuration, -t for test, etc.)." -} - -function InitializeCustomToolset { - if (-not $restore) { - return - } - - $script = Join-Path $EngRoot "restore-toolset.ps1" - - if (Test-Path $script) { - . $script - } -} - -function Build { - $toolsetBuildProj = InitializeToolset - InitializeCustomToolset - - $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } 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. - # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty. - [string[]] $msbuildArgs = $properties - $msbuildArgs += "/p:Projects=$projects" - $properties = $msbuildArgs - } - - MSBuild $toolsetBuildProj ` - $bl ` - $platformArg ` - /p:Configuration=$configuration ` - /p:RepoRoot=$RepoRoot ` - /p:Restore=$restore ` - /p:DeployDeps=$deployDeps ` - /p:Build=$build ` - /p:Rebuild=$rebuild ` - /p:Deploy=$deploy ` - /p:Test=$test ` - /p:Pack=$pack ` - /p:IntegrationTest=$integrationTest ` - /p:PerformanceTest=$performanceTest ` - /p:Sign=$sign ` - /p:Publish=$publish ` - @properties -} - -try { - if ($help -or (($null -ne $properties) -and ($properties.Contains("/help") -or $properties.Contains("/?")))) { - Print-Usage - exit 0 - } - - if ($ci) { - $binaryLog = $true - $nodeReuse = $false - } - - # Import custom tools configuration, if present in the repo. - # Note: Import in global scope so that the script set top-level variables without qualification. - $configureToolsetScript = Join-Path $EngRoot "configure-toolset.ps1" - if (Test-Path $configureToolsetScript) { - . $configureToolsetScript - } - - if (($restore) -and ($null -eq $env:DisableNativeToolsetInstalls)) { - InitializeNativeTools - } - - Build -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category "InitializeToolset" -Message $_ - ExitWithExitCode 1 -} - -ExitWithExitCode 0 +[CmdletBinding(PositionalBinding=$false)] +Param( + [string][Alias('c')]$configuration = "Debug", + [string]$platform = $null, + [string] $projects, + [string][Alias('v')]$verbosity = "minimal", + [string] $msbuildEngine = $null, + [bool] $warnAsError = $true, + [bool] $nodeReuse = $true, + [switch][Alias('r')]$restore, + [switch] $deployDeps, + [switch][Alias('b')]$build, + [switch] $rebuild, + [switch] $deploy, + [switch][Alias('t')]$test, + [switch] $integrationTest, + [switch] $performanceTest, + [switch] $sign, + [switch] $pack, + [switch] $publish, + [switch][Alias('bl')]$binaryLog, + [switch] $ci, + [switch] $prepareMachine, + [switch] $help, + [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties +) + +. $PSScriptRoot\tools.ps1 + +function Print-Usage() { + Write-Host "Common settings:" + Write-Host " -configuration Build configuration: 'Debug' or 'Release' (short: -c)" + Write-Host " -platform Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild" + Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" + Write-Host " -binaryLog Output binary log (short: -bl)" + Write-Host " -help Print help and exit" + Write-Host "" + + Write-Host "Actions:" + Write-Host " -restore Restore dependencies (short: -r)" + Write-Host " -build Build solution (short: -b)" + Write-Host " -rebuild Rebuild solution" + Write-Host " -deploy Deploy built VSIXes" + Write-Host " -deployDeps Deploy dependencies (e.g. VSIXes for integration tests)" + Write-Host " -test Run all unit tests in the solution (short: -t)" + Write-Host " -integrationTest Run all integration tests in the solution" + Write-Host " -performanceTest Run all performance tests in the solution" + Write-Host " -pack Package build outputs into NuGet packages and Willow components" + Write-Host " -sign Sign build outputs" + Write-Host " -publish Publish artifacts (e.g. symbols)" + Write-Host "" + + Write-Host "Advanced settings:" + Write-Host " -projects 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 " -prepareMachine Prepare machine for CI run, clean up processes after build" + Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host "" + + Write-Host "Command line arguments not listed above are passed thru to msbuild." + Write-Host "The above arguments can be shortened as much as to be unambiguous (e.g. -co for configuration, -t for test, etc.)." +} + +function InitializeCustomToolset { + if (-not $restore) { + return + } + + $script = Join-Path $EngRoot "restore-toolset.ps1" + + if (Test-Path $script) { + . $script + } +} + +function Build { + $toolsetBuildProj = InitializeToolset + InitializeCustomToolset + + $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } 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. + # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty. + [string[]] $msbuildArgs = $properties + $msbuildArgs += "/p:Projects=$projects" + $properties = $msbuildArgs + } + + MSBuild $toolsetBuildProj ` + $bl ` + $platformArg ` + /p:Configuration=$configuration ` + /p:RepoRoot=$RepoRoot ` + /p:Restore=$restore ` + /p:DeployDeps=$deployDeps ` + /p:Build=$build ` + /p:Rebuild=$rebuild ` + /p:Deploy=$deploy ` + /p:Test=$test ` + /p:Pack=$pack ` + /p:IntegrationTest=$integrationTest ` + /p:PerformanceTest=$performanceTest ` + /p:Sign=$sign ` + /p:Publish=$publish ` + @properties +} + +try { + if ($help -or (($null -ne $properties) -and ($properties.Contains("/help") -or $properties.Contains("/?")))) { + Print-Usage + exit 0 + } + + if ($ci) { + $binaryLog = $true + $nodeReuse = $false + } + + # Import custom tools configuration, if present in the repo. + # Note: Import in global scope so that the script set top-level variables without qualification. + $configureToolsetScript = Join-Path $EngRoot "configure-toolset.ps1" + if (Test-Path $configureToolsetScript) { + . $configureToolsetScript + } + + if (($restore) -and ($null -eq $env:DisableNativeToolsetInstalls)) { + InitializeNativeTools + } + + Build +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category "InitializeToolset" -Message $_ + ExitWithExitCode 1 +} + +ExitWithExitCode 0 diff --git a/eng/common/build.sh b/eng/common/build.sh index dd6e7898d1a..6236fc4d38c 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -1,216 +1,216 @@ -#!/usr/bin/env bash - -# Stop script if unbound variable found (use ${var:-} if intentional) -set -u - -# Stop script if command returns non-zero exit code. -# Prevents hidden errors caused by missing error code propagation. -set -e - -usage() -{ - echo "Common settings:" - echo " --configuration Build configuration: 'Debug' or 'Release' (short: -c)" - echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" - echo " --binaryLog Create MSBuild binary log (short: -bl)" - echo " --help Print help and exit (short: -h)" - echo "" - - echo "Actions:" - echo " --restore Restore dependencies (short: -r)" - echo " --build Build solution (short: -b)" - echo " --rebuild Rebuild solution" - echo " --test Run all unit tests in the solution (short: -t)" - echo " --integrationTest Run all integration tests in the solution" - echo " --performanceTest Run all performance tests in the solution" - echo " --pack Package build outputs into NuGet packages and Willow components" - echo " --sign Sign build outputs" - echo " --publish Publish artifacts (e.g. symbols)" - echo "" - - echo "Advanced settings:" - echo " --projects Project or solution file(s) to build" - echo " --ci Set when running on CI server" - echo " --prepareMachine Prepare machine for CI run, clean up processes after build" - echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" - echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" - echo "" - echo "Command line arguments not listed above are passed thru to msbuild." - echo "Arguments can also be passed in with a single hyphen." -} - -source="${BASH_SOURCE[0]}" - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -restore=false -build=false -rebuild=false -test=false -integration_test=false -performance_test=false -pack=false -publish=false -sign=false -public=false -ci=false - -warn_as_error=true -node_reuse=true -binary_log=false -pipelines_log=false - -projects='' -configuration='Debug' -prepare_machine=false -verbosity='minimal' - -properties='' - -while [[ $# > 0 ]]; do - opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" - case "$opt" in - -help|-h) - usage - exit 0 - ;; - -configuration|-c) - configuration=$2 - shift - ;; - -verbosity|-v) - verbosity=$2 - shift - ;; - -binarylog|-bl) - binary_log=true - ;; - -pipelineslog|-pl) - pipelines_log=true - ;; - -restore|-r) - restore=true - ;; - -build|-b) - build=true - ;; - -rebuild) - rebuild=true - ;; - -pack) - pack=true - ;; - -test|-t) - test=true - ;; - -integrationtest) - integration_test=true - ;; - -performancetest) - performance_test=true - ;; - -sign) - sign=true - ;; - -publish) - publish=true - ;; - -preparemachine) - prepare_machine=true - ;; - -projects) - projects=$2 - shift - ;; - -ci) - ci=true - ;; - -warnaserror) - warn_as_error=$2 - shift - ;; - -nodereuse) - node_reuse=$2 - shift - ;; - *) - properties="$properties $1" - ;; - esac - - shift -done - -if [[ "$ci" == true ]]; then - pipelines_log=true - binary_log=true - node_reuse=false -fi - -. "$scriptroot/tools.sh" - -function InitializeCustomToolset { - local script="$eng_root/restore-toolset.sh" - - if [[ -a "$script" ]]; then - . "$script" - fi -} - -function Build { - InitializeToolset - InitializeCustomToolset - - if [[ ! -z "$projects" ]]; then - properties="$properties /p:Projects=$projects" - fi - - local bl="" - if [[ "$binary_log" == true ]]; then - bl="/bl:\"$log_dir/Build.binlog\"" - fi - - MSBuild $_InitializeToolset \ - $bl \ - /p:Configuration=$configuration \ - /p:RepoRoot="$repo_root" \ - /p:Restore=$restore \ - /p:Build=$build \ - /p:Rebuild=$rebuild \ - /p:Test=$test \ - /p:Pack=$pack \ - /p:IntegrationTest=$integration_test \ - /p:PerformanceTest=$performance_test \ - /p:Sign=$sign \ - /p:Publish=$publish \ - $properties - - ExitWithExitCode 0 -} - -# Import custom tools configuration, if present in the repo. -configure_toolset_script="$eng_root/configure-toolset.sh" -if [[ -a "$configure_toolset_script" ]]; then - . "$configure_toolset_script" -fi - -# TODO: https://github.com/dotnet/arcade/issues/1468 -# Temporary workaround to avoid breaking change. -# Remove once repos are updated. -if [[ -n "${useInstalledDotNetCli:-}" ]]; then - use_installed_dotnet_cli="$useInstalledDotNetCli" -fi - -if [[ "$restore" == true && -z ${DisableNativeToolsetInstalls:-} ]]; then - InitializeNativeTools -fi - -Build +#!/usr/bin/env bash + +# Stop script if unbound variable found (use ${var:-} if intentional) +set -u + +# Stop script if command returns non-zero exit code. +# Prevents hidden errors caused by missing error code propagation. +set -e + +usage() +{ + echo "Common settings:" + echo " --configuration Build configuration: 'Debug' or 'Release' (short: -c)" + echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" + echo " --binaryLog Create MSBuild binary log (short: -bl)" + echo " --help Print help and exit (short: -h)" + echo "" + + echo "Actions:" + echo " --restore Restore dependencies (short: -r)" + echo " --build Build solution (short: -b)" + echo " --rebuild Rebuild solution" + echo " --test Run all unit tests in the solution (short: -t)" + echo " --integrationTest Run all integration tests in the solution" + echo " --performanceTest Run all performance tests in the solution" + echo " --pack Package build outputs into NuGet packages and Willow components" + echo " --sign Sign build outputs" + echo " --publish Publish artifacts (e.g. symbols)" + echo "" + + echo "Advanced settings:" + echo " --projects Project or solution file(s) to build" + echo " --ci Set when running on CI server" + echo " --prepareMachine Prepare machine for CI run, clean up processes after build" + echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" + echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + echo "" + echo "Command line arguments not listed above are passed thru to msbuild." + echo "Arguments can also be passed in with a single hyphen." +} + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +restore=false +build=false +rebuild=false +test=false +integration_test=false +performance_test=false +pack=false +publish=false +sign=false +public=false +ci=false + +warn_as_error=true +node_reuse=true +binary_log=false +pipelines_log=false + +projects='' +configuration='Debug' +prepare_machine=false +verbosity='minimal' + +properties='' + +while [[ $# > 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -help|-h) + usage + exit 0 + ;; + -configuration|-c) + configuration=$2 + shift + ;; + -verbosity|-v) + verbosity=$2 + shift + ;; + -binarylog|-bl) + binary_log=true + ;; + -pipelineslog|-pl) + pipelines_log=true + ;; + -restore|-r) + restore=true + ;; + -build|-b) + build=true + ;; + -rebuild) + rebuild=true + ;; + -pack) + pack=true + ;; + -test|-t) + test=true + ;; + -integrationtest) + integration_test=true + ;; + -performancetest) + performance_test=true + ;; + -sign) + sign=true + ;; + -publish) + publish=true + ;; + -preparemachine) + prepare_machine=true + ;; + -projects) + projects=$2 + shift + ;; + -ci) + ci=true + ;; + -warnaserror) + warn_as_error=$2 + shift + ;; + -nodereuse) + node_reuse=$2 + shift + ;; + *) + properties="$properties $1" + ;; + esac + + shift +done + +if [[ "$ci" == true ]]; then + pipelines_log=true + binary_log=true + node_reuse=false +fi + +. "$scriptroot/tools.sh" + +function InitializeCustomToolset { + local script="$eng_root/restore-toolset.sh" + + if [[ -a "$script" ]]; then + . "$script" + fi +} + +function Build { + InitializeToolset + InitializeCustomToolset + + if [[ ! -z "$projects" ]]; then + properties="$properties /p:Projects=$projects" + fi + + local bl="" + if [[ "$binary_log" == true ]]; then + bl="/bl:\"$log_dir/Build.binlog\"" + fi + + MSBuild $_InitializeToolset \ + $bl \ + /p:Configuration=$configuration \ + /p:RepoRoot="$repo_root" \ + /p:Restore=$restore \ + /p:Build=$build \ + /p:Rebuild=$rebuild \ + /p:Test=$test \ + /p:Pack=$pack \ + /p:IntegrationTest=$integration_test \ + /p:PerformanceTest=$performance_test \ + /p:Sign=$sign \ + /p:Publish=$publish \ + $properties + + ExitWithExitCode 0 +} + +# Import custom tools configuration, if present in the repo. +configure_toolset_script="$eng_root/configure-toolset.sh" +if [[ -a "$configure_toolset_script" ]]; then + . "$configure_toolset_script" +fi + +# TODO: https://github.com/dotnet/arcade/issues/1468 +# Temporary workaround to avoid breaking change. +# Remove once repos are updated. +if [[ -n "${useInstalledDotNetCli:-}" ]]; then + use_installed_dotnet_cli="$useInstalledDotNetCli" +fi + +if [[ "$restore" == true && -z ${DisableNativeToolsetInstalls:-} ]]; then + InitializeNativeTools +fi + +Build diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh index 01746f84a0e..1a02c0dec8f 100755 --- a/eng/common/cibuild.sh +++ b/eng/common/cibuild.sh @@ -1,16 +1,16 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $SOURCE until the file is no longer a symlink -while [[ -h $source ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - - # if $source was a relative symlink, we need to resolve it relative to the path where - # the symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where + # the symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + . "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ \ No newline at end of file diff --git a/eng/common/cross/android/arm/toolchain.cmake b/eng/common/cross/android/arm/toolchain.cmake index 1cbc48958dc..a7e1c73501b 100644 --- a/eng/common/cross/android/arm/toolchain.cmake +++ b/eng/common/cross/android/arm/toolchain.cmake @@ -1,41 +1,41 @@ -set(CROSS_NDK_TOOLCHAIN $ENV{ROOTFS_DIR}/../) -set(CROSS_ROOTFS ${CROSS_NDK_TOOLCHAIN}/sysroot) -set(CLR_CMAKE_PLATFORM_ANDROID "Android") - -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR arm) - -## Specify the toolchain -set(TOOLCHAIN "arm-linux-androideabi") -set(CMAKE_PREFIX_PATH ${CROSS_NDK_TOOLCHAIN}) -set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-) - -find_program(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}clang) -find_program(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}clang++) -find_program(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}clang) -find_program(CMAKE_AR ${TOOLCHAIN_PREFIX}ar) -find_program(CMAKE_LD ${TOOLCHAIN_PREFIX}ar) -find_program(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) -find_program(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump) - -add_compile_options(--sysroot=${CROSS_ROOTFS}) -add_compile_options(-fPIE) -add_compile_options(-mfloat-abi=soft) -include_directories(SYSTEM ${CROSS_NDK_TOOLCHAIN}/include/c++/4.9.x/) -include_directories(SYSTEM ${CROSS_NDK_TOOLCHAIN}/include/c++/4.9.x/arm-linux-androideabi/) - -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -fPIE -pie") - -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) - -set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +set(CROSS_NDK_TOOLCHAIN $ENV{ROOTFS_DIR}/../) +set(CROSS_ROOTFS ${CROSS_NDK_TOOLCHAIN}/sysroot) +set(CLR_CMAKE_PLATFORM_ANDROID "Android") + +set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_VERSION 1) +set(CMAKE_SYSTEM_PROCESSOR arm) + +## Specify the toolchain +set(TOOLCHAIN "arm-linux-androideabi") +set(CMAKE_PREFIX_PATH ${CROSS_NDK_TOOLCHAIN}) +set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-) + +find_program(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}clang) +find_program(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}clang++) +find_program(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}clang) +find_program(CMAKE_AR ${TOOLCHAIN_PREFIX}ar) +find_program(CMAKE_LD ${TOOLCHAIN_PREFIX}ar) +find_program(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) +find_program(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump) + +add_compile_options(--sysroot=${CROSS_ROOTFS}) +add_compile_options(-fPIE) +add_compile_options(-mfloat-abi=soft) +include_directories(SYSTEM ${CROSS_NDK_TOOLCHAIN}/include/c++/4.9.x/) +include_directories(SYSTEM ${CROSS_NDK_TOOLCHAIN}/include/c++/4.9.x/arm-linux-androideabi/) + +set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") +set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") +set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}") +set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -fPIE -pie") + +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) + +set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) diff --git a/eng/common/cross/android/arm64/toolchain.cmake b/eng/common/cross/android/arm64/toolchain.cmake index 7c3d0d06e88..29415899c1c 100644 --- a/eng/common/cross/android/arm64/toolchain.cmake +++ b/eng/common/cross/android/arm64/toolchain.cmake @@ -1,42 +1,42 @@ -set(CROSS_NDK_TOOLCHAIN $ENV{ROOTFS_DIR}/../) -set(CROSS_ROOTFS ${CROSS_NDK_TOOLCHAIN}/sysroot) -set(CLR_CMAKE_PLATFORM_ANDROID "Android") - -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR aarch64) - -## Specify the toolchain -set(TOOLCHAIN "aarch64-linux-android") -set(CMAKE_PREFIX_PATH ${CROSS_NDK_TOOLCHAIN}) -set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-) - -find_program(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}clang) -find_program(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}clang++) -find_program(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}clang) -find_program(CMAKE_AR ${TOOLCHAIN_PREFIX}ar) -find_program(CMAKE_LD ${TOOLCHAIN_PREFIX}ar) -find_program(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) -find_program(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump) - -add_compile_options(--sysroot=${CROSS_ROOTFS}) -add_compile_options(-fPIE) - -## Needed for Android or bionic specific conditionals -add_compile_options(-D__ANDROID__) -add_compile_options(-D__BIONIC__) - -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -fPIE -pie") - -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) - -set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +set(CROSS_NDK_TOOLCHAIN $ENV{ROOTFS_DIR}/../) +set(CROSS_ROOTFS ${CROSS_NDK_TOOLCHAIN}/sysroot) +set(CLR_CMAKE_PLATFORM_ANDROID "Android") + +set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_VERSION 1) +set(CMAKE_SYSTEM_PROCESSOR aarch64) + +## Specify the toolchain +set(TOOLCHAIN "aarch64-linux-android") +set(CMAKE_PREFIX_PATH ${CROSS_NDK_TOOLCHAIN}) +set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-) + +find_program(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}clang) +find_program(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}clang++) +find_program(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}clang) +find_program(CMAKE_AR ${TOOLCHAIN_PREFIX}ar) +find_program(CMAKE_LD ${TOOLCHAIN_PREFIX}ar) +find_program(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) +find_program(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump) + +add_compile_options(--sysroot=${CROSS_ROOTFS}) +add_compile_options(-fPIE) + +## Needed for Android or bionic specific conditionals +add_compile_options(-D__ANDROID__) +add_compile_options(-D__BIONIC__) + +set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") +set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") +set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}") +set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -fPIE -pie") + +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) + +set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) diff --git a/eng/common/cross/arm/sources.list.bionic b/eng/common/cross/arm/sources.list.bionic index a447075be91..21095574095 100644 --- a/eng/common/cross/arm/sources.list.bionic +++ b/eng/common/cross/arm/sources.list.bionic @@ -1,11 +1,11 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse +deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.jessie b/eng/common/cross/arm/sources.list.jessie index b209ca88ceb..4d142ac9b10 100644 --- a/eng/common/cross/arm/sources.list.jessie +++ b/eng/common/cross/arm/sources.list.jessie @@ -1,3 +1,3 @@ -# Debian (sid) # UNSTABLE -deb http://ftp.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.debian.org/debian/ sid main contrib non-free +# Debian (sid) # UNSTABLE +deb http://ftp.debian.org/debian/ sid main contrib non-free +deb-src http://ftp.debian.org/debian/ sid main contrib non-free diff --git a/eng/common/cross/arm/sources.list.trusty b/eng/common/cross/arm/sources.list.trusty index b79622576b4..07d8f88d82e 100644 --- a/eng/common/cross/arm/sources.list.trusty +++ b/eng/common/cross/arm/sources.list.trusty @@ -1,11 +1,11 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse +deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse \ No newline at end of file diff --git a/eng/common/cross/arm/sources.list.xenial b/eng/common/cross/arm/sources.list.xenial index 1e043483fe4..eacd86b7df3 100644 --- a/eng/common/cross/arm/sources.list.xenial +++ b/eng/common/cross/arm/sources.list.xenial @@ -1,11 +1,11 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse +deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse \ No newline at end of file diff --git a/eng/common/cross/arm/sources.list.zesty b/eng/common/cross/arm/sources.list.zesty index 103d793a356..ea2c14a7874 100644 --- a/eng/common/cross/arm/sources.list.zesty +++ b/eng/common/cross/arm/sources.list.zesty @@ -1,11 +1,11 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse +deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse diff --git a/eng/common/cross/arm/trusty-lttng-2.4.patch b/eng/common/cross/arm/trusty-lttng-2.4.patch index f906212bb29..8e4dd7ae719 100644 --- a/eng/common/cross/arm/trusty-lttng-2.4.patch +++ b/eng/common/cross/arm/trusty-lttng-2.4.patch @@ -1,71 +1,71 @@ -From e72c9d7ead60e3317bd6d1fade995c07021c947b Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Thu, 7 May 2015 13:25:04 -0400 -Subject: [PATCH] Fix: building probe providers with C++ compiler - -Robert Daniels wrote: -> > I'm attempting to use lttng userspace tracing with a C++ application -> > on an ARM platform. I'm using GCC 4.8.4 on Linux 3.14 with the 2.6 -> > release of lttng. I've compiled lttng-modules, lttng-ust, and -> > lttng-tools and have been able to get a simple test working with C -> > code. When I attempt to run the hello.cxx test on my target it will -> > segfault. -> -> -> I spent a little time digging into this issue and finally discovered the -> cause of my segfault with ARM C++ tracepoints. -> -> There is a struct called 'lttng_event' in ust-events.h which contains an -> empty union 'u'. This was the cause of my issue. Under C, this empty union -> compiles to a zero byte member while under C++ it compiles to a one byte -> member, and in my case was four-byte aligned which caused my C++ code to -> have the 'cds_list_head node' offset incorrectly by four bytes. This lead -> to an incorrect linked list structure which caused my issue. -> -> Since this union is empty, I simply removed it from the struct and everything -> worked correctly. -> -> I don't know the history or purpose behind this empty union so I'd like to -> know if this is a safe fix. If it is I can submit a patch with the union -> removed. - -That's a very nice catch! - -We do not support building tracepoint probe provider with -g++ yet, as stated in lttng-ust(3): - -"- Note for C++ support: although an application instrumented with - tracepoints can be compiled with g++, tracepoint probes should be - compiled with gcc (only tested with gcc so far)." - -However, if it works fine with this fix, then I'm tempted to take it, -especially because removing the empty union does not appear to affect -the layout of struct lttng_event as seen from liblttng-ust, which must -be compiled with a C compiler, and from probe providers compiled with -a C compiler. So all we are changing is the layout of a probe provider -compiled with a C++ compiler, which is anyway buggy at the moment, -because it is not compatible with the layout expected by liblttng-ust -compiled with a C compiler. - -Reported-by: Robert Daniels -Signed-off-by: Mathieu Desnoyers ---- - include/lttng/ust-events.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/usr/include/lttng/ust-events.h b/usr/include/lttng/ust-events.h -index 328a875..3d7a274 100644 ---- a/usr/include/lttng/ust-events.h -+++ b/usr/include/lttng/ust-events.h -@@ -407,8 +407,6 @@ struct lttng_event { - void *_deprecated1; - struct lttng_ctx *ctx; - enum lttng_ust_instrumentation instrumentation; -- union { -- } u; - struct cds_list_head node; /* Event list in session */ - struct cds_list_head _deprecated2; - void *_deprecated3; --- -2.7.4 - +From e72c9d7ead60e3317bd6d1fade995c07021c947b Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Thu, 7 May 2015 13:25:04 -0400 +Subject: [PATCH] Fix: building probe providers with C++ compiler + +Robert Daniels wrote: +> > I'm attempting to use lttng userspace tracing with a C++ application +> > on an ARM platform. I'm using GCC 4.8.4 on Linux 3.14 with the 2.6 +> > release of lttng. I've compiled lttng-modules, lttng-ust, and +> > lttng-tools and have been able to get a simple test working with C +> > code. When I attempt to run the hello.cxx test on my target it will +> > segfault. +> +> +> I spent a little time digging into this issue and finally discovered the +> cause of my segfault with ARM C++ tracepoints. +> +> There is a struct called 'lttng_event' in ust-events.h which contains an +> empty union 'u'. This was the cause of my issue. Under C, this empty union +> compiles to a zero byte member while under C++ it compiles to a one byte +> member, and in my case was four-byte aligned which caused my C++ code to +> have the 'cds_list_head node' offset incorrectly by four bytes. This lead +> to an incorrect linked list structure which caused my issue. +> +> Since this union is empty, I simply removed it from the struct and everything +> worked correctly. +> +> I don't know the history or purpose behind this empty union so I'd like to +> know if this is a safe fix. If it is I can submit a patch with the union +> removed. + +That's a very nice catch! + +We do not support building tracepoint probe provider with +g++ yet, as stated in lttng-ust(3): + +"- Note for C++ support: although an application instrumented with + tracepoints can be compiled with g++, tracepoint probes should be + compiled with gcc (only tested with gcc so far)." + +However, if it works fine with this fix, then I'm tempted to take it, +especially because removing the empty union does not appear to affect +the layout of struct lttng_event as seen from liblttng-ust, which must +be compiled with a C compiler, and from probe providers compiled with +a C compiler. So all we are changing is the layout of a probe provider +compiled with a C++ compiler, which is anyway buggy at the moment, +because it is not compatible with the layout expected by liblttng-ust +compiled with a C compiler. + +Reported-by: Robert Daniels +Signed-off-by: Mathieu Desnoyers +--- + include/lttng/ust-events.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/usr/include/lttng/ust-events.h b/usr/include/lttng/ust-events.h +index 328a875..3d7a274 100644 +--- a/usr/include/lttng/ust-events.h ++++ b/usr/include/lttng/ust-events.h +@@ -407,8 +407,6 @@ struct lttng_event { + void *_deprecated1; + struct lttng_ctx *ctx; + enum lttng_ust_instrumentation instrumentation; +- union { +- } u; + struct cds_list_head node; /* Event list in session */ + struct cds_list_head _deprecated2; + void *_deprecated3; +-- +2.7.4 + diff --git a/eng/common/cross/arm/trusty.patch b/eng/common/cross/arm/trusty.patch index d578de062a8..2f2972f8eb5 100644 --- a/eng/common/cross/arm/trusty.patch +++ b/eng/common/cross/arm/trusty.patch @@ -1,97 +1,97 @@ -diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h ---- a/usr/include/urcu/uatomic/generic.h 2014-03-28 06:04:42.000000000 +0900 -+++ b/usr/include/urcu/uatomic/generic.h 2017-02-13 10:35:21.189927116 +0900 -@@ -65,17 +65,17 @@ - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- return __sync_val_compare_and_swap_1(addr, old, _new); -+ return __sync_val_compare_and_swap_1((uint8_t *) addr, old, _new); - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- return __sync_val_compare_and_swap_2(addr, old, _new); -+ return __sync_val_compare_and_swap_2((uint16_t *) addr, old, _new); - #endif - case 4: -- return __sync_val_compare_and_swap_4(addr, old, _new); -+ return __sync_val_compare_and_swap_4((uint32_t *) addr, old, _new); - #if (CAA_BITS_PER_LONG == 64) - case 8: -- return __sync_val_compare_and_swap_8(addr, old, _new); -+ return __sync_val_compare_and_swap_8((uint64_t *) addr, old, _new); - #endif - } - _uatomic_link_error(); -@@ -100,20 +100,20 @@ - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- __sync_and_and_fetch_1(addr, val); -+ __sync_and_and_fetch_1((uint8_t *) addr, val); - return; - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- __sync_and_and_fetch_2(addr, val); -+ __sync_and_and_fetch_2((uint16_t *) addr, val); - return; - #endif - case 4: -- __sync_and_and_fetch_4(addr, val); -+ __sync_and_and_fetch_4((uint32_t *) addr, val); - return; - #if (CAA_BITS_PER_LONG == 64) - case 8: -- __sync_and_and_fetch_8(addr, val); -+ __sync_and_and_fetch_8((uint64_t *) addr, val); - return; - #endif - } -@@ -139,20 +139,20 @@ - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- __sync_or_and_fetch_1(addr, val); -+ __sync_or_and_fetch_1((uint8_t *) addr, val); - return; - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- __sync_or_and_fetch_2(addr, val); -+ __sync_or_and_fetch_2((uint16_t *) addr, val); - return; - #endif - case 4: -- __sync_or_and_fetch_4(addr, val); -+ __sync_or_and_fetch_4((uint32_t *) addr, val); - return; - #if (CAA_BITS_PER_LONG == 64) - case 8: -- __sync_or_and_fetch_8(addr, val); -+ __sync_or_and_fetch_8((uint64_t *) addr, val); - return; - #endif - } -@@ -180,17 +180,17 @@ - switch (len) { - #ifdef UATOMIC_HAS_ATOMIC_BYTE - case 1: -- return __sync_add_and_fetch_1(addr, val); -+ return __sync_add_and_fetch_1((uint8_t *) addr, val); - #endif - #ifdef UATOMIC_HAS_ATOMIC_SHORT - case 2: -- return __sync_add_and_fetch_2(addr, val); -+ return __sync_add_and_fetch_2((uint16_t *) addr, val); - #endif - case 4: -- return __sync_add_and_fetch_4(addr, val); -+ return __sync_add_and_fetch_4((uint32_t *) addr, val); - #if (CAA_BITS_PER_LONG == 64) - case 8: -- return __sync_add_and_fetch_8(addr, val); -+ return __sync_add_and_fetch_8((uint64_t *) addr, val); - #endif - } - _uatomic_link_error(); +diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h +--- a/usr/include/urcu/uatomic/generic.h 2014-03-28 06:04:42.000000000 +0900 ++++ b/usr/include/urcu/uatomic/generic.h 2017-02-13 10:35:21.189927116 +0900 +@@ -65,17 +65,17 @@ + switch (len) { + #ifdef UATOMIC_HAS_ATOMIC_BYTE + case 1: +- return __sync_val_compare_and_swap_1(addr, old, _new); ++ return __sync_val_compare_and_swap_1((uint8_t *) addr, old, _new); + #endif + #ifdef UATOMIC_HAS_ATOMIC_SHORT + case 2: +- return __sync_val_compare_and_swap_2(addr, old, _new); ++ return __sync_val_compare_and_swap_2((uint16_t *) addr, old, _new); + #endif + case 4: +- return __sync_val_compare_and_swap_4(addr, old, _new); ++ return __sync_val_compare_and_swap_4((uint32_t *) addr, old, _new); + #if (CAA_BITS_PER_LONG == 64) + case 8: +- return __sync_val_compare_and_swap_8(addr, old, _new); ++ return __sync_val_compare_and_swap_8((uint64_t *) addr, old, _new); + #endif + } + _uatomic_link_error(); +@@ -100,20 +100,20 @@ + switch (len) { + #ifdef UATOMIC_HAS_ATOMIC_BYTE + case 1: +- __sync_and_and_fetch_1(addr, val); ++ __sync_and_and_fetch_1((uint8_t *) addr, val); + return; + #endif + #ifdef UATOMIC_HAS_ATOMIC_SHORT + case 2: +- __sync_and_and_fetch_2(addr, val); ++ __sync_and_and_fetch_2((uint16_t *) addr, val); + return; + #endif + case 4: +- __sync_and_and_fetch_4(addr, val); ++ __sync_and_and_fetch_4((uint32_t *) addr, val); + return; + #if (CAA_BITS_PER_LONG == 64) + case 8: +- __sync_and_and_fetch_8(addr, val); ++ __sync_and_and_fetch_8((uint64_t *) addr, val); + return; + #endif + } +@@ -139,20 +139,20 @@ + switch (len) { + #ifdef UATOMIC_HAS_ATOMIC_BYTE + case 1: +- __sync_or_and_fetch_1(addr, val); ++ __sync_or_and_fetch_1((uint8_t *) addr, val); + return; + #endif + #ifdef UATOMIC_HAS_ATOMIC_SHORT + case 2: +- __sync_or_and_fetch_2(addr, val); ++ __sync_or_and_fetch_2((uint16_t *) addr, val); + return; + #endif + case 4: +- __sync_or_and_fetch_4(addr, val); ++ __sync_or_and_fetch_4((uint32_t *) addr, val); + return; + #if (CAA_BITS_PER_LONG == 64) + case 8: +- __sync_or_and_fetch_8(addr, val); ++ __sync_or_and_fetch_8((uint64_t *) addr, val); + return; + #endif + } +@@ -180,17 +180,17 @@ + switch (len) { + #ifdef UATOMIC_HAS_ATOMIC_BYTE + case 1: +- return __sync_add_and_fetch_1(addr, val); ++ return __sync_add_and_fetch_1((uint8_t *) addr, val); + #endif + #ifdef UATOMIC_HAS_ATOMIC_SHORT + case 2: +- return __sync_add_and_fetch_2(addr, val); ++ return __sync_add_and_fetch_2((uint16_t *) addr, val); + #endif + case 4: +- return __sync_add_and_fetch_4(addr, val); ++ return __sync_add_and_fetch_4((uint32_t *) addr, val); + #if (CAA_BITS_PER_LONG == 64) + case 8: +- return __sync_add_and_fetch_8(addr, val); ++ return __sync_add_and_fetch_8((uint64_t *) addr, val); + #endif + } + _uatomic_link_error(); diff --git a/eng/common/cross/arm64/sources.list.bionic b/eng/common/cross/arm64/sources.list.bionic index a447075be91..21095574095 100644 --- a/eng/common/cross/arm64/sources.list.bionic +++ b/eng/common/cross/arm64/sources.list.bionic @@ -1,11 +1,11 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse +deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.buster b/eng/common/cross/arm64/sources.list.buster index 96a02b81c04..7194ac64a96 100644 --- a/eng/common/cross/arm64/sources.list.buster +++ b/eng/common/cross/arm64/sources.list.buster @@ -1,11 +1,11 @@ -deb http://deb.debian.org/debian buster main -deb-src http://deb.debian.org/debian buster main - -deb http://deb.debian.org/debian-security/ buster/updates main -deb-src http://deb.debian.org/debian-security/ buster/updates main - -deb http://deb.debian.org/debian buster-updates main -deb-src http://deb.debian.org/debian buster-updates main - -deb http://deb.debian.org/debian buster-backports main contrib non-free -deb-src http://deb.debian.org/debian buster-backports main contrib non-free +deb http://deb.debian.org/debian buster main +deb-src http://deb.debian.org/debian buster main + +deb http://deb.debian.org/debian-security/ buster/updates main +deb-src http://deb.debian.org/debian-security/ buster/updates main + +deb http://deb.debian.org/debian buster-updates main +deb-src http://deb.debian.org/debian buster-updates main + +deb http://deb.debian.org/debian buster-backports main contrib non-free +deb-src http://deb.debian.org/debian buster-backports main contrib non-free diff --git a/eng/common/cross/arm64/sources.list.stretch b/eng/common/cross/arm64/sources.list.stretch index 658d0721c71..0e121577436 100644 --- a/eng/common/cross/arm64/sources.list.stretch +++ b/eng/common/cross/arm64/sources.list.stretch @@ -1,12 +1,12 @@ -deb http://deb.debian.org/debian stretch main -deb-src http://deb.debian.org/debian stretch main - -deb http://deb.debian.org/debian-security/ stretch/updates main -deb-src http://deb.debian.org/debian-security/ stretch/updates main - -deb http://deb.debian.org/debian stretch-updates main -deb-src http://deb.debian.org/debian stretch-updates main - -deb http://deb.debian.org/debian stretch-backports main contrib non-free -deb-src http://deb.debian.org/debian stretch-backports main contrib non-free - +deb http://deb.debian.org/debian stretch main +deb-src http://deb.debian.org/debian stretch main + +deb http://deb.debian.org/debian-security/ stretch/updates main +deb-src http://deb.debian.org/debian-security/ stretch/updates main + +deb http://deb.debian.org/debian stretch-updates main +deb-src http://deb.debian.org/debian stretch-updates main + +deb http://deb.debian.org/debian stretch-backports main contrib non-free +deb-src http://deb.debian.org/debian stretch-backports main contrib non-free + diff --git a/eng/common/cross/arm64/sources.list.trusty b/eng/common/cross/arm64/sources.list.trusty index b79622576b4..07d8f88d82e 100644 --- a/eng/common/cross/arm64/sources.list.trusty +++ b/eng/common/cross/arm64/sources.list.trusty @@ -1,11 +1,11 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse +deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse \ No newline at end of file diff --git a/eng/common/cross/arm64/sources.list.xenial b/eng/common/cross/arm64/sources.list.xenial index 1e043483fe4..eacd86b7df3 100644 --- a/eng/common/cross/arm64/sources.list.xenial +++ b/eng/common/cross/arm64/sources.list.xenial @@ -1,11 +1,11 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse +deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse \ No newline at end of file diff --git a/eng/common/cross/arm64/sources.list.zesty b/eng/common/cross/arm64/sources.list.zesty index 103d793a356..ea2c14a7874 100644 --- a/eng/common/cross/arm64/sources.list.zesty +++ b/eng/common/cross/arm64/sources.list.zesty @@ -1,11 +1,11 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse +deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse diff --git a/eng/common/cross/armel/sources.list.jessie b/eng/common/cross/armel/sources.list.jessie index 5afd7b191ea..3d9c3059d89 100644 --- a/eng/common/cross/armel/sources.list.jessie +++ b/eng/common/cross/armel/sources.list.jessie @@ -1,3 +1,3 @@ -# Debian (jessie) # Stable -deb http://ftp.debian.org/debian/ jessie main contrib non-free -deb-src http://ftp.debian.org/debian/ jessie main contrib non-free +# Debian (jessie) # Stable +deb http://ftp.debian.org/debian/ jessie main contrib non-free +deb-src http://ftp.debian.org/debian/ jessie main contrib non-free diff --git a/eng/common/cross/armel/tizen-build-rootfs.sh b/eng/common/cross/armel/tizen-build-rootfs.sh index 590e0af0cd9..87c48e78fbb 100644 --- a/eng/common/cross/armel/tizen-build-rootfs.sh +++ b/eng/common/cross/armel/tizen-build-rootfs.sh @@ -1,44 +1,44 @@ -#!/usr/bin/env bash -set -e - -__ARM_SOFTFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -__TIZEN_CROSSDIR="$__ARM_SOFTFP_CrossDir/tizen" - -if [[ -z "$ROOTFS_DIR" ]]; then - echo "ROOTFS_DIR is not defined." - exit 1; -fi - -# Clean-up (TODO-Cleanup: We may already delete $ROOTFS_DIR at ./cross/build-rootfs.sh.) -# hk0110 -if [ -d "$ROOTFS_DIR" ]; then - umount $ROOTFS_DIR/* - rm -rf $ROOTFS_DIR -fi - -TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp -mkdir -p $TIZEN_TMP_DIR - -# Download files -echo ">>Start downloading files" -VERBOSE=1 $__ARM_SOFTFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR -echo "<>Start constructing Tizen rootfs" -TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm` -cd $ROOTFS_DIR -for f in $TIZEN_RPM_FILES; do - rpm2cpio $f | cpio -idm --quiet -done -echo "<>Start configuring Tizen rootfs" -rm ./usr/lib/libunwind.so -ln -s libunwind.so.8 ./usr/lib/libunwind.so -ln -sfn asm-arm ./usr/include/asm -patch -p1 < $__TIZEN_CROSSDIR/tizen.patch -echo "<>Start downloading files" +VERBOSE=1 $__ARM_SOFTFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR +echo "<>Start constructing Tizen rootfs" +TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm` +cd $ROOTFS_DIR +for f in $TIZEN_RPM_FILES; do + rpm2cpio $f | cpio -idm --quiet +done +echo "<>Start configuring Tizen rootfs" +rm ./usr/lib/libunwind.so +ln -s libunwind.so.8 ./usr/lib/libunwind.so +ln -sfn asm-arm ./usr/include/asm +patch -p1 < $__TIZEN_CROSSDIR/tizen.patch +echo "</dev/null; then - VERBOSE=0 -fi - -Log() -{ - if [ $VERBOSE -ge $1 ]; then - echo ${@:2} - fi -} - -Inform() -{ - Log 1 -e "\x1B[0;34m$@\x1B[m" -} - -Debug() -{ - Log 2 -e "\x1B[0;32m$@\x1B[m" -} - -Error() -{ - >&2 Log 0 -e "\x1B[0;31m$@\x1B[m" -} - -Fetch() -{ - URL=$1 - FILE=$2 - PROGRESS=$3 - if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then - CURL_OPT="--progress-bar" - else - CURL_OPT="--silent" - fi - curl $CURL_OPT $URL > $FILE -} - -hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; } -hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; } -hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; } - -TMPDIR=$1 -if [ ! -d $TMPDIR ]; then - TMPDIR=./tizen_tmp - Debug "Create temporary directory : $TMPDIR" - mkdir -p $TMPDIR -fi - -TIZEN_URL=http://download.tizen.org/releases/milestone/tizen -BUILD_XML=build.xml -REPOMD_XML=repomd.xml -PRIMARY_XML=primary.xml -TARGET_URL="http://__not_initialized" - -Xpath_get() -{ - XPATH_RESULT='' - XPATH=$1 - XML_FILE=$2 - RESULT=$(xmllint --xpath $XPATH $XML_FILE) - if [[ -z ${RESULT// } ]]; then - Error "Can not find target from $XML_FILE" - Debug "Xpath = $XPATH" - exit 1 - fi - XPATH_RESULT=$RESULT -} - -fetch_tizen_pkgs_init() -{ - TARGET=$1 - PROFILE=$2 - Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE" - - TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs - if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi - mkdir -p $TMP_PKG_DIR - - PKG_URL=$TIZEN_URL/$PROFILE/latest - - BUILD_XML_URL=$PKG_URL/$BUILD_XML - TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML - TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML - TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML - TMP_PRIMARYGZ=${TMP_PRIMARY}.gz - - Fetch $BUILD_XML_URL $TMP_BUILD - - Debug "fetch $BUILD_XML_URL to $TMP_BUILD" - - TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()" - Xpath_get $TARGET_XPATH $TMP_BUILD - TARGET_PATH=$XPATH_RESULT - TARGET_URL=$PKG_URL/$TARGET_PATH - - REPOMD_URL=$TARGET_URL/repodata/repomd.xml - PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)' - - Fetch $REPOMD_URL $TMP_REPOMD - - Debug "fetch $REPOMD_URL to $TMP_REPOMD" - - Xpath_get $PRIMARY_XPATH $TMP_REPOMD - PRIMARY_XML_PATH=$XPATH_RESULT - PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH - - Fetch $PRIMARY_URL $TMP_PRIMARYGZ - - Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ" - - gunzip $TMP_PRIMARYGZ - - Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" -} - -fetch_tizen_pkgs() -{ - ARCH=$1 - PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)' - - PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())' - - for pkg in ${@:2} - do - Inform "Fetching... $pkg" - XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg} - XPATH=${XPATH/_ARCH_/$ARCH} - Xpath_get $XPATH $TMP_PRIMARY - PKG_PATH=$XPATH_RESULT - - XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg} - XPATH=${XPATH/_ARCH_/$ARCH} - Xpath_get $XPATH $TMP_PRIMARY - CHECKSUM=$XPATH_RESULT - - PKG_URL=$TARGET_URL/$PKG_PATH - PKG_FILE=$(basename $PKG_PATH) - PKG_PATH=$TMPDIR/$PKG_FILE - - Debug "Download $PKG_URL to $PKG_PATH" - Fetch $PKG_URL $PKG_PATH true - - echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null - if [ $? -ne 0 ]; then - Error "Fail to fetch $PKG_URL to $PKG_PATH" - Debug "Checksum = $CHECKSUM" - exit 1 - fi - done -} - -Inform "Initialize arm base" -fetch_tizen_pkgs_init standard base -Inform "fetch common packages" -fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic -fetch_tizen_pkgs noarch linux-glibc-devel -Inform "fetch coreclr packages" -fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu -Inform "fetch corefx packages" -fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel - -Inform "Initialize standard unified" -fetch_tizen_pkgs_init standard unified -Inform "fetch corefx packages" -fetch_tizen_pkgs armv7l gssdp gssdp-devel tizen-release - +#!/usr/bin/env bash +set -e + +if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then + VERBOSE=0 +fi + +Log() +{ + if [ $VERBOSE -ge $1 ]; then + echo ${@:2} + fi +} + +Inform() +{ + Log 1 -e "\x1B[0;34m$@\x1B[m" +} + +Debug() +{ + Log 2 -e "\x1B[0;32m$@\x1B[m" +} + +Error() +{ + >&2 Log 0 -e "\x1B[0;31m$@\x1B[m" +} + +Fetch() +{ + URL=$1 + FILE=$2 + PROGRESS=$3 + if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then + CURL_OPT="--progress-bar" + else + CURL_OPT="--silent" + fi + curl $CURL_OPT $URL > $FILE +} + +hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; } +hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; } +hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; } + +TMPDIR=$1 +if [ ! -d $TMPDIR ]; then + TMPDIR=./tizen_tmp + Debug "Create temporary directory : $TMPDIR" + mkdir -p $TMPDIR +fi + +TIZEN_URL=http://download.tizen.org/releases/milestone/tizen +BUILD_XML=build.xml +REPOMD_XML=repomd.xml +PRIMARY_XML=primary.xml +TARGET_URL="http://__not_initialized" + +Xpath_get() +{ + XPATH_RESULT='' + XPATH=$1 + XML_FILE=$2 + RESULT=$(xmllint --xpath $XPATH $XML_FILE) + if [[ -z ${RESULT// } ]]; then + Error "Can not find target from $XML_FILE" + Debug "Xpath = $XPATH" + exit 1 + fi + XPATH_RESULT=$RESULT +} + +fetch_tizen_pkgs_init() +{ + TARGET=$1 + PROFILE=$2 + Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE" + + TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs + if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi + mkdir -p $TMP_PKG_DIR + + PKG_URL=$TIZEN_URL/$PROFILE/latest + + BUILD_XML_URL=$PKG_URL/$BUILD_XML + TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML + TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML + TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML + TMP_PRIMARYGZ=${TMP_PRIMARY}.gz + + Fetch $BUILD_XML_URL $TMP_BUILD + + Debug "fetch $BUILD_XML_URL to $TMP_BUILD" + + TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()" + Xpath_get $TARGET_XPATH $TMP_BUILD + TARGET_PATH=$XPATH_RESULT + TARGET_URL=$PKG_URL/$TARGET_PATH + + REPOMD_URL=$TARGET_URL/repodata/repomd.xml + PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)' + + Fetch $REPOMD_URL $TMP_REPOMD + + Debug "fetch $REPOMD_URL to $TMP_REPOMD" + + Xpath_get $PRIMARY_XPATH $TMP_REPOMD + PRIMARY_XML_PATH=$XPATH_RESULT + PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH + + Fetch $PRIMARY_URL $TMP_PRIMARYGZ + + Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ" + + gunzip $TMP_PRIMARYGZ + + Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY" +} + +fetch_tizen_pkgs() +{ + ARCH=$1 + PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)' + + PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())' + + for pkg in ${@:2} + do + Inform "Fetching... $pkg" + XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg} + XPATH=${XPATH/_ARCH_/$ARCH} + Xpath_get $XPATH $TMP_PRIMARY + PKG_PATH=$XPATH_RESULT + + XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg} + XPATH=${XPATH/_ARCH_/$ARCH} + Xpath_get $XPATH $TMP_PRIMARY + CHECKSUM=$XPATH_RESULT + + PKG_URL=$TARGET_URL/$PKG_PATH + PKG_FILE=$(basename $PKG_PATH) + PKG_PATH=$TMPDIR/$PKG_FILE + + Debug "Download $PKG_URL to $PKG_PATH" + Fetch $PKG_URL $PKG_PATH true + + echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null + if [ $? -ne 0 ]; then + Error "Fail to fetch $PKG_URL to $PKG_PATH" + Debug "Checksum = $CHECKSUM" + exit 1 + fi + done +} + +Inform "Initialize arm base" +fetch_tizen_pkgs_init standard base +Inform "fetch common packages" +fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic +fetch_tizen_pkgs noarch linux-glibc-devel +Inform "fetch coreclr packages" +fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu +Inform "fetch corefx packages" +fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel + +Inform "Initialize standard unified" +fetch_tizen_pkgs_init standard unified +Inform "fetch corefx packages" +fetch_tizen_pkgs armv7l gssdp gssdp-devel tizen-release + diff --git a/eng/common/cross/armel/tizen/tizen-dotnet.ks b/eng/common/cross/armel/tizen/tizen-dotnet.ks index c258134a79b..506d455bd4f 100644 --- a/eng/common/cross/armel/tizen/tizen-dotnet.ks +++ b/eng/common/cross/armel/tizen/tizen-dotnet.ks @@ -1,50 +1,50 @@ -lang en_US.UTF-8 -keyboard us -timezone --utc Asia/Seoul - -part / --fstype="ext4" --size=3500 --ondisk=mmcblk0 --label rootfs --fsoptions=defaults,noatime - -rootpw tizen -desktop --autologinuser=root -user --name root --groups audio,video --password 'tizen' - -repo --name=standard --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/ --ssl_verify=no -repo --name=base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ --ssl_verify=no - -%packages -tar -gzip - -sed -grep -gawk -perl - -binutils -findutils -util-linux -lttng-ust -userspace-rcu -procps-ng -tzdata -ca-certificates - - -### Core FX -libicu -libunwind -iputils -zlib -krb5 -libcurl -libopenssl - -%end - -%post - -### Update /tmp privilege -chmod 777 /tmp -#################################### - -%end +lang en_US.UTF-8 +keyboard us +timezone --utc Asia/Seoul + +part / --fstype="ext4" --size=3500 --ondisk=mmcblk0 --label rootfs --fsoptions=defaults,noatime + +rootpw tizen +desktop --autologinuser=root +user --name root --groups audio,video --password 'tizen' + +repo --name=standard --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/ --ssl_verify=no +repo --name=base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ --ssl_verify=no + +%packages +tar +gzip + +sed +grep +gawk +perl + +binutils +findutils +util-linux +lttng-ust +userspace-rcu +procps-ng +tzdata +ca-certificates + + +### Core FX +libicu +libunwind +iputils +zlib +krb5 +libcurl +libopenssl + +%end + +%post + +### Update /tmp privilege +chmod 777 /tmp +#################################### + +%end diff --git a/eng/common/cross/armel/tizen/tizen.patch b/eng/common/cross/armel/tizen/tizen.patch index 47648b0305f..d223427c978 100644 --- a/eng/common/cross/armel/tizen/tizen.patch +++ b/eng/common/cross/armel/tizen/tizen.patch @@ -1,18 +1,18 @@ -diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so ---- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 -+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) --GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) ) -+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) ) -diff -u -r a/usr/lib/libpthread.so b/usr/lib/libpthread.so ---- a/usr/lib/libpthread.so 2016-12-30 23:00:19.408951841 +0900 -+++ b/usr/lib/libpthread.so 2016-12-30 23:00:39.068951801 +0900 -@@ -2,4 +2,4 @@ - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) --GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a ) -+GROUP ( libpthread.so.0 libpthread_nonshared.a ) +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) ) +diff -u -r a/usr/lib/libpthread.so b/usr/lib/libpthread.so +--- a/usr/lib/libpthread.so 2016-12-30 23:00:19.408951841 +0900 ++++ b/usr/lib/libpthread.so 2016-12-30 23:00:39.068951801 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) +-GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a ) ++GROUP ( libpthread.so.0 libpthread_nonshared.a ) diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index c23fb58f806..adceda877ad 100644 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -1,137 +1,137 @@ -#!/usr/bin/env bash -set -e -__NDK_Version=r14 - -usage() -{ - echo "Creates a toolchain and sysroot used for cross-compiling for Android." - echo. - echo "Usage: $0 [BuildArch] [ApiLevel]" - echo. - echo "BuildArch is the target architecture of Android. Currently only arm64 is supported." - echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html" - echo. - echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior" - echo "by setting the TOOLCHAIN_DIR environment variable" - echo. - echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation," - echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK." - echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.21-arm64. This file is to replace '/etc/os-release', which is not available for Android." - exit 1 -} - -__ApiLevel=21 # The minimum platform for arm64 is API level 21 -__BuildArch=arm64 -__AndroidArch=aarch64 -__AndroidToolchain=aarch64-linux-android - -for i in "$@" - do - lowerI="$(echo $i | awk '{print tolower($0)}')" - case $lowerI in - -?|-h|--help) - usage - exit 1 - ;; - arm64) - __BuildArch=arm64 - __AndroidArch=aarch64 - __AndroidToolchain=aarch64-linux-android - ;; - arm) - __BuildArch=arm - __AndroidArch=arm - __AndroidToolchain=arm-linux-androideabi - ;; - *[0-9]) - __ApiLevel=$i - ;; - *) - __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i" - ;; - esac -done - -# Obtain the location of the bash script to figure out where the root of the repo is. -__CrossDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -__Android_Cross_Dir="$__CrossDir/android-rootfs" -__NDK_Dir="$__Android_Cross_Dir/android-ndk-$__NDK_Version" -__libunwind_Dir="$__Android_Cross_Dir/libunwind" -__lldb_Dir="$__Android_Cross_Dir/lldb" -__ToolchainDir="$__Android_Cross_Dir/toolchain/$__BuildArch" - -if [[ -n "$TOOLCHAIN_DIR" ]]; then - __ToolchainDir=$TOOLCHAIN_DIR -fi - -if [[ -n "$NDK_DIR" ]]; then - __NDK_Dir=$NDK_DIR -fi - -echo "Target API level: $__ApiLevel" -echo "Target architecture: $__BuildArch" -echo "NDK location: $__NDK_Dir" -echo "Target Toolchain location: $__ToolchainDir" - -# Download the NDK if required -if [ ! -d $__NDK_Dir ]; then - echo Downloading the NDK into $__NDK_Dir - mkdir -p $__NDK_Dir - wget -nv -nc --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__Android_Cross_Dir/android-ndk-$__NDK_Version-linux-x86_64.zip - unzip -q $__Android_Cross_Dir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__Android_Cross_Dir -fi - -if [ ! -d $__lldb_Dir ]; then - mkdir -p $__lldb_Dir - echo Downloading LLDB into $__lldb_Dir - wget -nv -nc --show-progress https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip -O $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip - unzip -q $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip -d $__lldb_Dir -fi - -# Create the RootFS for both arm64 as well as aarch -rm -rf $__Android_Cross_Dir/toolchain - -echo Generating the $__BuildArch toolchain -$__NDK_Dir/build/tools/make_standalone_toolchain.py --arch $__BuildArch --api $__ApiLevel --install-dir $__ToolchainDir - -# Install the required packages into the toolchain -# TODO: Add logic to get latest pkg version instead of specific version number -rm -rf $__Android_Cross_Dir/deb/ -rm -rf $__Android_Cross_Dir/tmp - -mkdir -p $__Android_Cross_Dir/deb/ -mkdir -p $__Android_Cross_Dir/tmp/$arch/ -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu-dev_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb - -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob-dev_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support-dev_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support_22_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/liblzma-dev_5.2.3_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/liblzma-dev_5.2.3_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/liblzma_5.2.3_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/liblzma_5.2.3_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind-dev_1.2.20170304_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libunwind-dev_1.2.20170304_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind_1.2.20170304_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libunwind_1.2.20170304_$__AndroidArch.deb - -echo Unpacking Termux packages -dpkg -x $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libandroid-support_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/liblzma-dev_5.2.3_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/liblzma_5.2.3_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libunwind-dev_1.2.20170304_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libunwind_1.2.20170304_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ - -cp -R $__Android_Cross_Dir/tmp/$__AndroidArch/data/data/com.termux/files/usr/* $__ToolchainDir/sysroot/usr/ - -# Generate platform file for build.sh script to assign to __DistroRid -echo "Generating platform file..." - -echo "RID=android.21-arm64" > $__ToolchainDir/sysroot/android_platform -echo Now run: -echo CONFIG_DIR=\`realpath cross/android/$__BuildArch\` ROOTFS_DIR=\`realpath $__ToolchainDir/sysroot\` ./build.sh cross $__BuildArch skipgenerateversion skipnuget cmakeargs -DENABLE_LLDBPLUGIN=0 - +#!/usr/bin/env bash +set -e +__NDK_Version=r14 + +usage() +{ + echo "Creates a toolchain and sysroot used for cross-compiling for Android." + echo. + echo "Usage: $0 [BuildArch] [ApiLevel]" + echo. + echo "BuildArch is the target architecture of Android. Currently only arm64 is supported." + echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html" + echo. + echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior" + echo "by setting the TOOLCHAIN_DIR environment variable" + echo. + echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation," + echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK." + echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.21-arm64. This file is to replace '/etc/os-release', which is not available for Android." + exit 1 +} + +__ApiLevel=21 # The minimum platform for arm64 is API level 21 +__BuildArch=arm64 +__AndroidArch=aarch64 +__AndroidToolchain=aarch64-linux-android + +for i in "$@" + do + lowerI="$(echo $i | awk '{print tolower($0)}')" + case $lowerI in + -?|-h|--help) + usage + exit 1 + ;; + arm64) + __BuildArch=arm64 + __AndroidArch=aarch64 + __AndroidToolchain=aarch64-linux-android + ;; + arm) + __BuildArch=arm + __AndroidArch=arm + __AndroidToolchain=arm-linux-androideabi + ;; + *[0-9]) + __ApiLevel=$i + ;; + *) + __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i" + ;; + esac +done + +# Obtain the location of the bash script to figure out where the root of the repo is. +__CrossDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +__Android_Cross_Dir="$__CrossDir/android-rootfs" +__NDK_Dir="$__Android_Cross_Dir/android-ndk-$__NDK_Version" +__libunwind_Dir="$__Android_Cross_Dir/libunwind" +__lldb_Dir="$__Android_Cross_Dir/lldb" +__ToolchainDir="$__Android_Cross_Dir/toolchain/$__BuildArch" + +if [[ -n "$TOOLCHAIN_DIR" ]]; then + __ToolchainDir=$TOOLCHAIN_DIR +fi + +if [[ -n "$NDK_DIR" ]]; then + __NDK_Dir=$NDK_DIR +fi + +echo "Target API level: $__ApiLevel" +echo "Target architecture: $__BuildArch" +echo "NDK location: $__NDK_Dir" +echo "Target Toolchain location: $__ToolchainDir" + +# Download the NDK if required +if [ ! -d $__NDK_Dir ]; then + echo Downloading the NDK into $__NDK_Dir + mkdir -p $__NDK_Dir + wget -nv -nc --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__Android_Cross_Dir/android-ndk-$__NDK_Version-linux-x86_64.zip + unzip -q $__Android_Cross_Dir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__Android_Cross_Dir +fi + +if [ ! -d $__lldb_Dir ]; then + mkdir -p $__lldb_Dir + echo Downloading LLDB into $__lldb_Dir + wget -nv -nc --show-progress https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip -O $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip + unzip -q $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip -d $__lldb_Dir +fi + +# Create the RootFS for both arm64 as well as aarch +rm -rf $__Android_Cross_Dir/toolchain + +echo Generating the $__BuildArch toolchain +$__NDK_Dir/build/tools/make_standalone_toolchain.py --arch $__BuildArch --api $__ApiLevel --install-dir $__ToolchainDir + +# Install the required packages into the toolchain +# TODO: Add logic to get latest pkg version instead of specific version number +rm -rf $__Android_Cross_Dir/deb/ +rm -rf $__Android_Cross_Dir/tmp + +mkdir -p $__Android_Cross_Dir/deb/ +mkdir -p $__Android_Cross_Dir/tmp/$arch/ +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu-dev_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb + +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob-dev_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support-dev_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support_22_$__AndroidArch.deb +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/liblzma-dev_5.2.3_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/liblzma-dev_5.2.3_$__AndroidArch.deb +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/liblzma_5.2.3_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/liblzma_5.2.3_$__AndroidArch.deb +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind-dev_1.2.20170304_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libunwind-dev_1.2.20170304_$__AndroidArch.deb +wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind_1.2.20170304_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libunwind_1.2.20170304_$__AndroidArch.deb + +echo Unpacking Termux packages +dpkg -x $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/libandroid-support_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/liblzma-dev_5.2.3_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/liblzma_5.2.3_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/libunwind-dev_1.2.20170304_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +dpkg -x $__Android_Cross_Dir/deb/libunwind_1.2.20170304_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ + +cp -R $__Android_Cross_Dir/tmp/$__AndroidArch/data/data/com.termux/files/usr/* $__ToolchainDir/sysroot/usr/ + +# Generate platform file for build.sh script to assign to __DistroRid +echo "Generating platform file..." + +echo "RID=android.21-arm64" > $__ToolchainDir/sysroot/android_platform +echo Now run: +echo CONFIG_DIR=\`realpath cross/android/$__BuildArch\` ROOTFS_DIR=\`realpath $__ToolchainDir/sysroot\` ./build.sh cross $__BuildArch skipgenerateversion skipnuget cmakeargs -DENABLE_LLDBPLUGIN=0 + diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 1ccb34a42e0..d7d5d7d5f44 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -1,234 +1,234 @@ -#!/usr/bin/env bash - -usage() -{ - echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" - echo "BuildArch can be: arm(default), armel, arm64, x86" - echo "LinuxCodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine" - echo "--skipunmount - optional, will skip the unmount of rootfs folder." - exit 1 -} - -__LinuxCodeName=xenial -__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -__InitialDir=$PWD -__BuildArch=arm -__UbuntuArch=armhf -__UbuntuRepo="http://ports.ubuntu.com/" -__LLDB_Package="liblldb-3.9-dev" -__SkipUnmount=0 - -# base development support -__UbuntuPackages="build-essential" - -__AlpinePackages="alpine-base" -__AlpinePackages+=" build-base" -__AlpinePackages+=" linux-headers" -__AlpinePackages+=" lldb-dev" -__AlpinePackages+=" llvm-dev" - -# symlinks fixer -__UbuntuPackages+=" symlinks" - -# CoreCLR and CoreFX dependencies -__UbuntuPackages+=" libicu-dev" -__UbuntuPackages+=" liblttng-ust-dev" -__UbuntuPackages+=" libunwind8-dev" - -__AlpinePackages+=" gettext-dev" -__AlpinePackages+=" icu-dev" -__AlpinePackages+=" libunwind-dev" -__AlpinePackages+=" lttng-ust-dev" - -# CoreFX dependencies -__UbuntuPackages+=" libcurl4-openssl-dev" -__UbuntuPackages+=" libkrb5-dev" -__UbuntuPackages+=" libssl-dev" -__UbuntuPackages+=" zlib1g-dev" - -__AlpinePackages+=" curl-dev" -__AlpinePackages+=" krb5-dev" -__AlpinePackages+=" openssl-dev" -__AlpinePackages+=" zlib-dev" - -__UnprocessedBuildArgs= -while :; do - if [ $# -le 0 ]; then - break - fi - - lowerI="$(echo $1 | awk '{print tolower($0)}')" - case $lowerI in - -?|-h|--help) - usage - exit 1 - ;; - arm) - __BuildArch=arm - __UbuntuArch=armhf - __AlpineArch=armhf - __QEMUArch=arm - ;; - arm64) - __BuildArch=arm64 - __UbuntuArch=arm64 - __AlpineArch=aarch64 - __QEMUArch=aarch64 - ;; - armel) - __BuildArch=armel - __UbuntuArch=armel - __UbuntuRepo="http://ftp.debian.org/debian/" - __LinuxCodeName=jessie - ;; - x86) - __BuildArch=x86 - __UbuntuArch=i386 - __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" - ;; - lldb3.6) - __LLDB_Package="lldb-3.6-dev" - ;; - lldb3.8) - __LLDB_Package="lldb-3.8-dev" - ;; - lldb3.9) - __LLDB_Package="liblldb-3.9-dev" - ;; - lldb4.0) - __LLDB_Package="liblldb-4.0-dev" - ;; - lldb5.0) - __LLDB_Package="liblldb-5.0-dev" - ;; - lldb6.0) - __LLDB_Package="liblldb-6.0-dev" - ;; - no-lldb) - unset __LLDB_Package - ;; - trusty) # Ubuntu 14.04 - if [ "$__LinuxCodeName" != "jessie" ]; then - __LinuxCodeName=trusty - fi - ;; - xenial) # Ubuntu 16.04 - if [ "$__LinuxCodeName" != "jessie" ]; then - __LinuxCodeName=xenial - fi - ;; - zesty) # Ubuntu 17.04 - if [ "$__LinuxCodeName" != "jessie" ]; then - __LinuxCodeName=zesty - fi - ;; - bionic) # Ubuntu 18.04 - if [ "$__LinuxCodeName" != "jessie" ]; then - __LinuxCodeName=bionic - fi - ;; - jessie) # Debian 8 - __LinuxCodeName=jessie - __UbuntuRepo="http://ftp.debian.org/debian/" - ;; - stretch) # Debian 9 - __LinuxCodeName=stretch - __UbuntuRepo="http://ftp.debian.org/debian/" - __LLDB_Package="liblldb-6.0-dev" - ;; - buster) # Debian 10 - __LinuxCodeName=buster - __UbuntuRepo="http://ftp.debian.org/debian/" - __LLDB_Package="liblldb-6.0-dev" - ;; - tizen) - if [ "$__BuildArch" != "armel" ]; then - echo "Tizen is available only for armel." - usage; - exit 1; - fi - __LinuxCodeName= - __UbuntuRepo= - __Tizen=tizen - ;; - alpine) - __LinuxCodeName=alpine - __UbuntuRepo= - ;; - --skipunmount) - __SkipUnmount=1 - ;; - --rootfsdir|-rootfsdir) - shift - __RootfsDir=$1 - ;; - *) - __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1" - ;; - esac - - shift -done - -if [ "$__BuildArch" == "armel" ]; then - __LLDB_Package="lldb-3.5-dev" -fi -__UbuntuPackages+=" ${__LLDB_Package:-}" - -if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then - __RootfsDir=$ROOTFS_DIR -fi - -if [ -z "$__RootfsDir" ]; then - __RootfsDir="$__CrossDir/../../../.tools/rootfs/$__BuildArch" -fi - -if [ -d "$__RootfsDir" ]; then - if [ $__SkipUnmount == 0 ]; then - umount $__RootfsDir/* - fi - rm -rf $__RootfsDir -fi - -if [[ "$__LinuxCodeName" == "alpine" ]]; then - __ApkToolsVersion=2.9.1 - __AlpineVersion=3.7 - __ApkToolsDir=$(mktemp -d) - wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir - tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir - mkdir -p $__RootfsDir/usr/bin - cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin - $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ - -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \ - -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \ - -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ - -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ - add $__AlpinePackages - rm -r $__ApkToolsDir -elif [[ -n $__LinuxCodeName ]]; then - qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo - cp $__CrossDir/$__BuildArch/sources.list.$__LinuxCodeName $__RootfsDir/etc/apt/sources.list - chroot $__RootfsDir apt-get update - chroot $__RootfsDir apt-get -f -y install - chroot $__RootfsDir apt-get -y install $__UbuntuPackages - chroot $__RootfsDir symlinks -cr /usr - - if [ $__SkipUnmount == 0 ]; then - umount $__RootfsDir/* - fi - - if [[ "$__BuildArch" == "arm" && "$__LinuxCodeName" == "trusty" ]]; then - pushd $__RootfsDir - patch -p1 < $__CrossDir/$__BuildArch/trusty.patch - patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch - popd - fi -elif [ "$__Tizen" == "tizen" ]; then - ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh -else - echo "Unsupported target platform." - usage; - exit 1 -fi +#!/usr/bin/env bash + +usage() +{ + echo "Usage: $0 [BuildArch] [LinuxCodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" + echo "BuildArch can be: arm(default), armel, arm64, x86" + echo "LinuxCodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." + echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine" + echo "--skipunmount - optional, will skip the unmount of rootfs folder." + exit 1 +} + +__LinuxCodeName=xenial +__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +__InitialDir=$PWD +__BuildArch=arm +__UbuntuArch=armhf +__UbuntuRepo="http://ports.ubuntu.com/" +__LLDB_Package="liblldb-3.9-dev" +__SkipUnmount=0 + +# base development support +__UbuntuPackages="build-essential" + +__AlpinePackages="alpine-base" +__AlpinePackages+=" build-base" +__AlpinePackages+=" linux-headers" +__AlpinePackages+=" lldb-dev" +__AlpinePackages+=" llvm-dev" + +# symlinks fixer +__UbuntuPackages+=" symlinks" + +# CoreCLR and CoreFX dependencies +__UbuntuPackages+=" libicu-dev" +__UbuntuPackages+=" liblttng-ust-dev" +__UbuntuPackages+=" libunwind8-dev" + +__AlpinePackages+=" gettext-dev" +__AlpinePackages+=" icu-dev" +__AlpinePackages+=" libunwind-dev" +__AlpinePackages+=" lttng-ust-dev" + +# CoreFX dependencies +__UbuntuPackages+=" libcurl4-openssl-dev" +__UbuntuPackages+=" libkrb5-dev" +__UbuntuPackages+=" libssl-dev" +__UbuntuPackages+=" zlib1g-dev" + +__AlpinePackages+=" curl-dev" +__AlpinePackages+=" krb5-dev" +__AlpinePackages+=" openssl-dev" +__AlpinePackages+=" zlib-dev" + +__UnprocessedBuildArgs= +while :; do + if [ $# -le 0 ]; then + break + fi + + lowerI="$(echo $1 | awk '{print tolower($0)}')" + case $lowerI in + -?|-h|--help) + usage + exit 1 + ;; + arm) + __BuildArch=arm + __UbuntuArch=armhf + __AlpineArch=armhf + __QEMUArch=arm + ;; + arm64) + __BuildArch=arm64 + __UbuntuArch=arm64 + __AlpineArch=aarch64 + __QEMUArch=aarch64 + ;; + armel) + __BuildArch=armel + __UbuntuArch=armel + __UbuntuRepo="http://ftp.debian.org/debian/" + __LinuxCodeName=jessie + ;; + x86) + __BuildArch=x86 + __UbuntuArch=i386 + __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" + ;; + lldb3.6) + __LLDB_Package="lldb-3.6-dev" + ;; + lldb3.8) + __LLDB_Package="lldb-3.8-dev" + ;; + lldb3.9) + __LLDB_Package="liblldb-3.9-dev" + ;; + lldb4.0) + __LLDB_Package="liblldb-4.0-dev" + ;; + lldb5.0) + __LLDB_Package="liblldb-5.0-dev" + ;; + lldb6.0) + __LLDB_Package="liblldb-6.0-dev" + ;; + no-lldb) + unset __LLDB_Package + ;; + trusty) # Ubuntu 14.04 + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=trusty + fi + ;; + xenial) # Ubuntu 16.04 + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=xenial + fi + ;; + zesty) # Ubuntu 17.04 + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=zesty + fi + ;; + bionic) # Ubuntu 18.04 + if [ "$__LinuxCodeName" != "jessie" ]; then + __LinuxCodeName=bionic + fi + ;; + jessie) # Debian 8 + __LinuxCodeName=jessie + __UbuntuRepo="http://ftp.debian.org/debian/" + ;; + stretch) # Debian 9 + __LinuxCodeName=stretch + __UbuntuRepo="http://ftp.debian.org/debian/" + __LLDB_Package="liblldb-6.0-dev" + ;; + buster) # Debian 10 + __LinuxCodeName=buster + __UbuntuRepo="http://ftp.debian.org/debian/" + __LLDB_Package="liblldb-6.0-dev" + ;; + tizen) + if [ "$__BuildArch" != "armel" ]; then + echo "Tizen is available only for armel." + usage; + exit 1; + fi + __LinuxCodeName= + __UbuntuRepo= + __Tizen=tizen + ;; + alpine) + __LinuxCodeName=alpine + __UbuntuRepo= + ;; + --skipunmount) + __SkipUnmount=1 + ;; + --rootfsdir|-rootfsdir) + shift + __RootfsDir=$1 + ;; + *) + __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1" + ;; + esac + + shift +done + +if [ "$__BuildArch" == "armel" ]; then + __LLDB_Package="lldb-3.5-dev" +fi +__UbuntuPackages+=" ${__LLDB_Package:-}" + +if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then + __RootfsDir=$ROOTFS_DIR +fi + +if [ -z "$__RootfsDir" ]; then + __RootfsDir="$__CrossDir/../../../.tools/rootfs/$__BuildArch" +fi + +if [ -d "$__RootfsDir" ]; then + if [ $__SkipUnmount == 0 ]; then + umount $__RootfsDir/* + fi + rm -rf $__RootfsDir +fi + +if [[ "$__LinuxCodeName" == "alpine" ]]; then + __ApkToolsVersion=2.9.1 + __AlpineVersion=3.7 + __ApkToolsDir=$(mktemp -d) + wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir + tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir + mkdir -p $__RootfsDir/usr/bin + cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin + $__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \ + -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \ + -X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ + -U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \ + add $__AlpinePackages + rm -r $__ApkToolsDir +elif [[ -n $__LinuxCodeName ]]; then + qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo + cp $__CrossDir/$__BuildArch/sources.list.$__LinuxCodeName $__RootfsDir/etc/apt/sources.list + chroot $__RootfsDir apt-get update + chroot $__RootfsDir apt-get -f -y install + chroot $__RootfsDir apt-get -y install $__UbuntuPackages + chroot $__RootfsDir symlinks -cr /usr + + if [ $__SkipUnmount == 0 ]; then + umount $__RootfsDir/* + fi + + if [[ "$__BuildArch" == "arm" && "$__LinuxCodeName" == "trusty" ]]; then + pushd $__RootfsDir + patch -p1 < $__CrossDir/$__BuildArch/trusty.patch + patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch + popd + fi +elif [ "$__Tizen" == "tizen" ]; then + ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh +else + echo "Unsupported target platform." + usage; + exit 1 +fi diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 46bda586040..071d4112419 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,138 +1,138 @@ -set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) - -set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) - -if(TARGET_ARCH_NAME STREQUAL "armel") - set(CMAKE_SYSTEM_PROCESSOR armv7l) - set(TOOLCHAIN "arm-linux-gnueabi") - if("$ENV{__DistroRid}" MATCHES "tizen.*") - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1") - endif() -elseif(TARGET_ARCH_NAME STREQUAL "arm") - set(CMAKE_SYSTEM_PROCESSOR armv7l) - if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) - set(TOOLCHAIN "armv6-alpine-linux-musleabihf") - else() - set(TOOLCHAIN "arm-linux-gnueabihf") - endif() -elseif(TARGET_ARCH_NAME STREQUAL "arm64") - set(CMAKE_SYSTEM_PROCESSOR aarch64) - if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) - set(TOOLCHAIN "aarch64-alpine-linux-musl") - else() - set(TOOLCHAIN "aarch64-linux-gnu") - endif() -elseif(TARGET_ARCH_NAME STREQUAL "x86") - set(CMAKE_SYSTEM_PROCESSOR i686) - set(TOOLCHAIN "i686-linux-gnu") -else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!") -endif() - -# Specify include paths -if(TARGET_ARCH_NAME STREQUAL "armel") - if(DEFINED TIZEN_TOOLCHAIN) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) - endif() -endif() - -# add_compile_param - adds only new options without duplicates. -# arg0 - list with result options, arg1 - list with new options. -# arg2 - optional argument, quick summary string for optional using CACHE FORCE mode. -macro(add_compile_param) - if(NOT ${ARGC} MATCHES "^(2|3)$") - message(FATAL_ERROR "Wrong using add_compile_param! Two or three parameters must be given! See add_compile_param description.") - endif() - foreach(OPTION ${ARGV1}) - if(NOT ${ARGV0} MATCHES "${OPTION}($| )") - set(${ARGV0} "${${ARGV0}} ${OPTION}") - if(${ARGC} EQUAL "3") # CACHE FORCE mode - set(${ARGV0} "${${ARGV0}}" CACHE STRING "${ARGV2}" FORCE) - endif() - endif() - endforeach() -endmacro() - -# Specify link flags -add_compile_param(CROSS_LINK_FLAGS "--sysroot=${CROSS_ROOTFS}") -add_compile_param(CROSS_LINK_FLAGS "--gcc-toolchain=${CROSS_ROOTFS}/usr") -add_compile_param(CROSS_LINK_FLAGS "--target=${TOOLCHAIN}") -add_compile_param(CROSS_LINK_FLAGS "-fuse-ld=gold") - -if(TARGET_ARCH_NAME STREQUAL "armel") - if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only - add_compile_param(CROSS_LINK_FLAGS "-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") - add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/lib") - add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib") - add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") - endif() -elseif(TARGET_ARCH_NAME STREQUAL "x86") - add_compile_param(CROSS_LINK_FLAGS "-m32") -endif() - -add_compile_param(CMAKE_EXE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") -add_compile_param(CMAKE_SHARED_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") -add_compile_param(CMAKE_MODULE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") - -# Specify compile options -add_compile_options("--sysroot=${CROSS_ROOTFS}") -add_compile_options("--target=${TOOLCHAIN}") -add_compile_options("--gcc-toolchain=${CROSS_ROOTFS}/usr") - -if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") - set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) - set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) - set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) -endif() - -if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") - add_compile_options(-mthumb) - add_compile_options(-mfpu=vfpv3) - if(TARGET_ARCH_NAME STREQUAL "armel") - add_compile_options(-mfloat-abi=softfp) - if(DEFINED TIZEN_TOOLCHAIN) - add_compile_options(-Wno-deprecated-declarations) # compile-time option - add_compile_options(-D__extern_always_inline=inline) # compile-time option - endif() - endif() -elseif(TARGET_ARCH_NAME STREQUAL "x86") - add_compile_options(-m32) - add_compile_options(-Wno-error=unused-command-line-argument) -endif() - -# Set LLDB include and library paths -if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") - if(TARGET_ARCH_NAME STREQUAL "x86") - set(LLVM_CROSS_DIR "$ENV{LLVM_CROSS_HOME}") - else() # arm/armel case - set(LLVM_CROSS_DIR "$ENV{LLVM_ARM_HOME}") - endif() - if(LLVM_CROSS_DIR) - set(WITH_LLDB_LIBS "${LLVM_CROSS_DIR}/lib/" CACHE STRING "") - set(WITH_LLDB_INCLUDES "${LLVM_CROSS_DIR}/include" CACHE STRING "") - set(LLDB_H "${WITH_LLDB_INCLUDES}" CACHE STRING "") - set(LLDB "${LLVM_CROSS_DIR}/lib/liblldb.so" CACHE STRING "") - else() - if(TARGET_ARCH_NAME STREQUAL "x86") - set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/i386-linux-gnu" CACHE STRING "") - set(CHECK_LLVM_DIR "${CROSS_ROOTFS}/usr/lib/llvm-3.8/include") - if(EXISTS "${CHECK_LLVM_DIR}" AND IS_DIRECTORY "${CHECK_LLVM_DIR}") - set(WITH_LLDB_INCLUDES "${CHECK_LLVM_DIR}") - else() - set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include") - endif() - else() # arm/armel case - set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "") - set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "") - endif() - endif() -endif() - -set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) + +set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) +set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_VERSION 1) + +if(TARGET_ARCH_NAME STREQUAL "armel") + set(CMAKE_SYSTEM_PROCESSOR armv7l) + set(TOOLCHAIN "arm-linux-gnueabi") + if("$ENV{__DistroRid}" MATCHES "tizen.*") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1") + endif() +elseif(TARGET_ARCH_NAME STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR armv7l) + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) + set(TOOLCHAIN "armv6-alpine-linux-musleabihf") + else() + set(TOOLCHAIN "arm-linux-gnueabihf") + endif() +elseif(TARGET_ARCH_NAME STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR aarch64) + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) + set(TOOLCHAIN "aarch64-alpine-linux-musl") + else() + set(TOOLCHAIN "aarch64-linux-gnu") + endif() +elseif(TARGET_ARCH_NAME STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR i686) + set(TOOLCHAIN "i686-linux-gnu") +else() + message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!") +endif() + +# Specify include paths +if(TARGET_ARCH_NAME STREQUAL "armel") + if(DEFINED TIZEN_TOOLCHAIN) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) + endif() +endif() + +# add_compile_param - adds only new options without duplicates. +# arg0 - list with result options, arg1 - list with new options. +# arg2 - optional argument, quick summary string for optional using CACHE FORCE mode. +macro(add_compile_param) + if(NOT ${ARGC} MATCHES "^(2|3)$") + message(FATAL_ERROR "Wrong using add_compile_param! Two or three parameters must be given! See add_compile_param description.") + endif() + foreach(OPTION ${ARGV1}) + if(NOT ${ARGV0} MATCHES "${OPTION}($| )") + set(${ARGV0} "${${ARGV0}} ${OPTION}") + if(${ARGC} EQUAL "3") # CACHE FORCE mode + set(${ARGV0} "${${ARGV0}}" CACHE STRING "${ARGV2}" FORCE) + endif() + endif() + endforeach() +endmacro() + +# Specify link flags +add_compile_param(CROSS_LINK_FLAGS "--sysroot=${CROSS_ROOTFS}") +add_compile_param(CROSS_LINK_FLAGS "--gcc-toolchain=${CROSS_ROOTFS}/usr") +add_compile_param(CROSS_LINK_FLAGS "--target=${TOOLCHAIN}") +add_compile_param(CROSS_LINK_FLAGS "-fuse-ld=gold") + +if(TARGET_ARCH_NAME STREQUAL "armel") + if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only + add_compile_param(CROSS_LINK_FLAGS "-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/lib") + add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib") + add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + endif() +elseif(TARGET_ARCH_NAME STREQUAL "x86") + add_compile_param(CROSS_LINK_FLAGS "-m32") +endif() + +add_compile_param(CMAKE_EXE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") +add_compile_param(CMAKE_SHARED_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") +add_compile_param(CMAKE_MODULE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") + +# Specify compile options +add_compile_options("--sysroot=${CROSS_ROOTFS}") +add_compile_options("--target=${TOOLCHAIN}") +add_compile_options("--gcc-toolchain=${CROSS_ROOTFS}/usr") + +if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") + set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) + set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) + set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) +endif() + +if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") + add_compile_options(-mthumb) + add_compile_options(-mfpu=vfpv3) + if(TARGET_ARCH_NAME STREQUAL "armel") + add_compile_options(-mfloat-abi=softfp) + if(DEFINED TIZEN_TOOLCHAIN) + add_compile_options(-Wno-deprecated-declarations) # compile-time option + add_compile_options(-D__extern_always_inline=inline) # compile-time option + endif() + endif() +elseif(TARGET_ARCH_NAME STREQUAL "x86") + add_compile_options(-m32) + add_compile_options(-Wno-error=unused-command-line-argument) +endif() + +# Set LLDB include and library paths +if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") + if(TARGET_ARCH_NAME STREQUAL "x86") + set(LLVM_CROSS_DIR "$ENV{LLVM_CROSS_HOME}") + else() # arm/armel case + set(LLVM_CROSS_DIR "$ENV{LLVM_ARM_HOME}") + endif() + if(LLVM_CROSS_DIR) + set(WITH_LLDB_LIBS "${LLVM_CROSS_DIR}/lib/" CACHE STRING "") + set(WITH_LLDB_INCLUDES "${LLVM_CROSS_DIR}/include" CACHE STRING "") + set(LLDB_H "${WITH_LLDB_INCLUDES}" CACHE STRING "") + set(LLDB "${LLVM_CROSS_DIR}/lib/liblldb.so" CACHE STRING "") + else() + if(TARGET_ARCH_NAME STREQUAL "x86") + set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/i386-linux-gnu" CACHE STRING "") + set(CHECK_LLVM_DIR "${CROSS_ROOTFS}/usr/lib/llvm-3.8/include") + if(EXISTS "${CHECK_LLVM_DIR}" AND IS_DIRECTORY "${CHECK_LLVM_DIR}") + set(WITH_LLDB_INCLUDES "${CHECK_LLVM_DIR}") + else() + set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include") + endif() + else() # arm/armel case + set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "") + set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "") + endif() + endif() +endif() + +set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) diff --git a/eng/common/cross/x86/sources.list.bionic b/eng/common/cross/x86/sources.list.bionic index e3038256950..a71ccadcffa 100644 --- a/eng/common/cross/x86/sources.list.bionic +++ b/eng/common/cross/x86/sources.list.bionic @@ -1,11 +1,11 @@ -deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted -deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted - -deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted +deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted + +deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse diff --git a/eng/common/cross/x86/sources.list.trusty b/eng/common/cross/x86/sources.list.trusty index fd6902adfe9..9b3085436e9 100644 --- a/eng/common/cross/x86/sources.list.trusty +++ b/eng/common/cross/x86/sources.list.trusty @@ -1,11 +1,11 @@ -deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ trusty main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted -deb-src http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted - -deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ trusty main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted +deb-src http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted + +deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse diff --git a/eng/common/cross/x86/sources.list.xenial b/eng/common/cross/x86/sources.list.xenial index 360816a43ea..ad9c5a0144e 100644 --- a/eng/common/cross/x86/sources.list.xenial +++ b/eng/common/cross/x86/sources.list.xenial @@ -1,11 +1,11 @@ -deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted -deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted - -deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted +deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted + +deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 0fd5d411144..8854d979f37 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,33 +1,33 @@ -param ( - $darcVersion = $null, - $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" -) - -$verbosity = "m" -. $PSScriptRoot\tools.ps1 - -function InstallDarcCli ($darcVersion) { - $darcCliPackageName = "microsoft.dotnet.darc" - - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - $toolList = & "$dotnet" tool list -g - - if ($toolList -like "*$darcCliPackageName*") { - & "$dotnet" tool uninstall $darcCliPackageName -g - } - - # If the user didn't explicitly specify the darc version, - # query the Maestro API for the correct version of darc to install. - if (-not $darcVersion) { - $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content - } - - $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json' - - Write-Host "Installing Darc CLI version $darcVersion..." - Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g -} - -InstallDarcCli $darcVersion +param ( + $darcVersion = $null, + $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" +) + +$verbosity = "m" +. $PSScriptRoot\tools.ps1 + +function InstallDarcCli ($darcVersion) { + $darcCliPackageName = "microsoft.dotnet.darc" + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list -g + + if ($toolList -like "*$darcCliPackageName*") { + & "$dotnet" tool uninstall $darcCliPackageName -g + } + + # If the user didn't explicitly specify the darc version, + # query the Maestro API for the correct version of darc to install. + if (-not $darcVersion) { + $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content + } + + $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json' + + Write-Host "Installing Darc CLI version $darcVersion..." + Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g +} + +InstallDarcCli $darcVersion diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 845a38b16da..abdd0bc05a1 100644 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -1,64 +1,64 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -darcVersion='' -versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" - -while [[ $# > 0 ]]; do - opt="$(echo "$1" | awk '{print tolower($0)}')" - case "$opt" in - --darcversion) - darcVersion=$2 - shift - ;; - --versionendpoint) - versionEndpoint=$2 - shift - ;; - *) - echo "Invalid argument: $1" - usage - exit 1 - ;; - esac - - shift -done - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -verbosity=m - -. "$scriptroot/tools.sh" - -if [ -z "$darcVersion" ]; then - darcVersion=$(curl -X GET "$versionEndpoint" -H "accept: text/plain") -fi - -function InstallDarcCli { - local darc_cli_package_name="microsoft.dotnet.darc" - - InitializeDotNetCli - local dotnet_root=$_InitializeDotNetCli - - local uninstall_command=`$dotnet_root/dotnet tool uninstall $darc_cli_package_name -g` - local tool_list=$($dotnet_root/dotnet tool list -g) - if [[ $tool_list = *$darc_cli_package_name* ]]; then - echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) - fi - - local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" - - echo "Installing Darc CLI version $darcVersion..." - echo "You may need to restart your command shell if this is the first dotnet tool you have installed." - echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) -} - -InstallDarcCli +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +darcVersion='' +versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" + +while [[ $# > 0 ]]; do + opt="$(echo "$1" | awk '{print tolower($0)}')" + case "$opt" in + --darcversion) + darcVersion=$2 + shift + ;; + --versionendpoint) + versionEndpoint=$2 + shift + ;; + *) + echo "Invalid argument: $1" + usage + exit 1 + ;; + esac + + shift +done + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +verbosity=m + +. "$scriptroot/tools.sh" + +if [ -z "$darcVersion" ]; then + darcVersion=$(curl -X GET "$versionEndpoint" -H "accept: text/plain") +fi + +function InstallDarcCli { + local darc_cli_package_name="microsoft.dotnet.darc" + + InitializeDotNetCli + local dotnet_root=$_InitializeDotNetCli + + local uninstall_command=`$dotnet_root/dotnet tool uninstall $darc_cli_package_name -g` + local tool_list=$($dotnet_root/dotnet tool list -g) + if [[ $tool_list = *$darc_cli_package_name* ]]; then + echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) + fi + + local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" + + echo "Installing Darc CLI version $darcVersion..." + echo "You may need to restart your command shell if this is the first dotnet tool you have installed." + echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) +} + +InstallDarcCli diff --git a/eng/common/dotnet-install.cmd b/eng/common/dotnet-install.cmd index ac4fb3af05f..b1c2642e76f 100644 --- a/eng/common/dotnet-install.cmd +++ b/eng/common/dotnet-install.cmd @@ -1,2 +1,2 @@ -@echo off +@echo off powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*" \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index a2b0fb18afa..0b629b8301a 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -1,27 +1,27 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $verbosity = "minimal", - [string] $architecture = "", - [string] $version = "Latest", - [string] $runtime = "dotnet" -) - -. $PSScriptRoot\tools.ps1 - -$dotnetRoot = Join-Path $RepoRoot ".dotnet" - -$installdir = $dotnetRoot -try { - if ($architecture -and $architecture.Trim() -eq "x86") { - $installdir = Join-Path $installdir "x86" - } - InstallDotNet $installdir $version $architecture $runtime $true -} -catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - ExitWithExitCode 1 -} - -ExitWithExitCode 0 +[CmdletBinding(PositionalBinding=$false)] +Param( + [string] $verbosity = "minimal", + [string] $architecture = "", + [string] $version = "Latest", + [string] $runtime = "dotnet" +) + +. $PSScriptRoot\tools.ps1 + +$dotnetRoot = Join-Path $RepoRoot ".dotnet" + +$installdir = $dotnetRoot +try { + if ($architecture -and $architecture.Trim() -eq "x86") { + $installdir = Join-Path $installdir "x86" + } + InstallDotNet $installdir $version $architecture $runtime $true +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} + +ExitWithExitCode 0 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 3c483d1c762..c3072c958af 100644 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -1,49 +1,49 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -version='Latest' -architecture='' -runtime='dotnet' -while [[ $# > 0 ]]; do - opt="$(echo "$1" | awk '{print tolower($0)}')" - case "$opt" in - -version|-v) - shift - version="$1" - ;; - -architecture|-a) - shift - architecture="$1" - ;; - -runtime|-r) - shift - runtime="$1" - ;; - *) - echo "Invalid argument: $1" - usage - exit 1 - ;; - esac - shift -done - -. "$scriptroot/tools.sh" -dotnetRoot="$repo_root/.dotnet" -InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { - local exit_code=$? - echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 - ExitWithExitCode $exit_code -} - -ExitWithExitCode 0 +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +version='Latest' +architecture='' +runtime='dotnet' +while [[ $# > 0 ]]; do + opt="$(echo "$1" | awk '{print tolower($0)}')" + case "$opt" in + -version|-v) + shift + version="$1" + ;; + -architecture|-a) + shift + architecture="$1" + ;; + -runtime|-r) + shift + runtime="$1" + ;; + *) + echo "Invalid argument: $1" + usage + exit 1 + ;; + esac + shift +done + +. "$scriptroot/tools.sh" +dotnetRoot="$repo_root/.dotnet" +InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { + local exit_code=$? + echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 + ExitWithExitCode $exit_code +} + +ExitWithExitCode 0 diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1 index fc388eb20f1..b056e4c1ac2 100644 --- a/eng/common/generate-graph-files.ps1 +++ b/eng/common/generate-graph-files.ps1 @@ -1,87 +1,87 @@ -Param( - [Parameter(Mandatory=$true)][string] $barToken, # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens - [Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed) - [Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed) - [Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created - [string] $darcVersion = '1.1.0-beta.19175.6', # darc's version - [string] $graphvizVersion = '2.38', # GraphViz version - [switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about - # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies -) - -$ErrorActionPreference = "Stop" -. $PSScriptRoot\tools.ps1 - -Import-Module -Name (Join-Path $PSScriptRoot "native\CommonLibrary.psm1") - -function CheckExitCode ([string]$stage) -{ - $exitCode = $LASTEXITCODE - if ($exitCode -ne 0) { - Write-Host "Something failed in stage: '$stage'. Check for errors above. Exiting now..." - ExitWithExitCode $exitCode - } -} - -try { - Push-Location $PSScriptRoot - - Write-Host "Installing darc..." - . .\darc-init.ps1 -darcVersion $darcVersion - CheckExitCode "Running darc-init" - - $engCommonBaseDir = Join-Path $PSScriptRoot "native\" - $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory - $nativeToolBaseUri = "https://netcorenativeassets.blob.core.windows.net/resource-packages/external" - $installBin = Join-Path $graphvizInstallDir "bin" - - Write-Host "Installing dot..." - .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose - - $darcExe = "$env:USERPROFILE\.dotnet\tools" - $darcExe = Resolve-Path "$darcExe\darc.exe" - - Create-Directory $outputFolder - - # Generate 3 graph descriptions: - # 1. Flat with coherency information - # 2. Graphviz (dot) file - # 3. Standard dependency graph - $graphVizFilePath = "$outputFolder\graphviz.txt" - $graphVizImageFilePath = "$outputFolder\graph.png" - $normalGraphFilePath = "$outputFolder\graph-full.txt" - $flatGraphFilePath = "$outputFolder\graph-flat.txt" - $baseOptions = @( "--github-pat", "$gitHubPat", "--azdev-pat", "$azdoPat", "--password", "$barToken" ) - - if ($includeToolset) { - Write-Host "Toolsets will be included in the graph..." - $baseOptions += @( "--include-toolset" ) - } - - Write-Host "Generating standard dependency graph..." - & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath - CheckExitCode "Generating normal dependency graph" - - Write-Host "Generating flat dependency graph and graphviz file..." - & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath - CheckExitCode "Generating flat and graphviz dependency graph" - - Write-Host "Generating graph image $graphVizFilePath" - $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe" - & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath" - CheckExitCode "Generating graphviz image" - - Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!" -} -catch { - if (!$includeToolset) { - Write-Host "This might be a toolset repo which includes only toolset dependencies. " -NoNewline -ForegroundColor Yellow - Write-Host "Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again..." -ForegroundColor Yellow - } - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - ExitWithExitCode 1 -} finally { - Pop-Location +Param( + [Parameter(Mandatory=$true)][string] $barToken, # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens + [Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed) + [Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed) + [Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created + [string] $darcVersion = '1.1.0-beta.19175.6', # darc's version + [string] $graphvizVersion = '2.38', # GraphViz version + [switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about + # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies +) + +$ErrorActionPreference = "Stop" +. $PSScriptRoot\tools.ps1 + +Import-Module -Name (Join-Path $PSScriptRoot "native\CommonLibrary.psm1") + +function CheckExitCode ([string]$stage) +{ + $exitCode = $LASTEXITCODE + if ($exitCode -ne 0) { + Write-Host "Something failed in stage: '$stage'. Check for errors above. Exiting now..." + ExitWithExitCode $exitCode + } +} + +try { + Push-Location $PSScriptRoot + + Write-Host "Installing darc..." + . .\darc-init.ps1 -darcVersion $darcVersion + CheckExitCode "Running darc-init" + + $engCommonBaseDir = Join-Path $PSScriptRoot "native\" + $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory + $nativeToolBaseUri = "https://netcorenativeassets.blob.core.windows.net/resource-packages/external" + $installBin = Join-Path $graphvizInstallDir "bin" + + Write-Host "Installing dot..." + .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose + + $darcExe = "$env:USERPROFILE\.dotnet\tools" + $darcExe = Resolve-Path "$darcExe\darc.exe" + + Create-Directory $outputFolder + + # Generate 3 graph descriptions: + # 1. Flat with coherency information + # 2. Graphviz (dot) file + # 3. Standard dependency graph + $graphVizFilePath = "$outputFolder\graphviz.txt" + $graphVizImageFilePath = "$outputFolder\graph.png" + $normalGraphFilePath = "$outputFolder\graph-full.txt" + $flatGraphFilePath = "$outputFolder\graph-flat.txt" + $baseOptions = @( "--github-pat", "$gitHubPat", "--azdev-pat", "$azdoPat", "--password", "$barToken" ) + + if ($includeToolset) { + Write-Host "Toolsets will be included in the graph..." + $baseOptions += @( "--include-toolset" ) + } + + Write-Host "Generating standard dependency graph..." + & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath + CheckExitCode "Generating normal dependency graph" + + Write-Host "Generating flat dependency graph and graphviz file..." + & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath + CheckExitCode "Generating flat and graphviz dependency graph" + + Write-Host "Generating graph image $graphVizFilePath" + $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe" + & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath" + CheckExitCode "Generating graphviz image" + + Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!" +} +catch { + if (!$includeToolset) { + Write-Host "This might be a toolset repo which includes only toolset dependencies. " -NoNewline -ForegroundColor Yellow + Write-Host "Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again..." -ForegroundColor Yellow + } + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} finally { + Pop-Location } \ No newline at end of file diff --git a/eng/common/helixpublish.proj b/eng/common/helixpublish.proj index f58bbf3f879..d7f185856e7 100644 --- a/eng/common/helixpublish.proj +++ b/eng/common/helixpublish.proj @@ -1,26 +1,26 @@ - - - - msbuild - - - - - %(Identity) - - - - - - $(WorkItemDirectory) - $(WorkItemCommand) - $(WorkItemTimeout) - - - - - - - - - + + + + msbuild + + + + + %(Identity) + + + + + + $(WorkItemDirectory) + $(WorkItemCommand) + $(WorkItemTimeout) + + + + + + + + + diff --git a/eng/common/init-tools-native.cmd b/eng/common/init-tools-native.cmd index fca2e139b41..438cd548c45 100644 --- a/eng/common/init-tools-native.cmd +++ b/eng/common/init-tools-native.cmd @@ -1,3 +1,3 @@ -@echo off -powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" +@echo off +powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" exit /b %ErrorLevel% \ No newline at end of file diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 389394ee945..9d18645f455 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -1,141 +1,141 @@ -<# -.SYNOPSIS -Entry point script for installing native tools - -.DESCRIPTION -Reads $RepoRoot\global.json file to determine native assets to install -and executes installers for those tools - -.PARAMETER BaseUri -Base file directory or Url from which to acquire tool archives - -.PARAMETER InstallDirectory -Directory to install native toolset. This is a command-line override for the default -Install directory precedence order: -- InstallDirectory command-line override -- NETCOREENG_INSTALL_DIRECTORY environment variable -- (default) %USERPROFILE%/.netcoreeng/native - -.PARAMETER Clean -Switch specifying to not install anything, but cleanup native asset folders - -.PARAMETER Force -Clean and then install tools - -.PARAMETER DownloadRetries -Total number of retry attempts - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds - -.PARAMETER GlobalJsonFile -File path to global.json file - -.NOTES -#> -[CmdletBinding(PositionalBinding=$false)] -Param ( - [string] $BaseUri = "https://netcorenativeassets.blob.core.windows.net/resource-packages/external", - [string] $InstallDirectory, - [switch] $Clean = $False, - [switch] $Force = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile -) - -if (!$GlobalJsonFile) { - $GlobalJsonFile = Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName "global.json" -} - -Set-StrictMode -version 2.0 -$ErrorActionPreference="Stop" - -Import-Module -Name (Join-Path $PSScriptRoot "native\CommonLibrary.psm1") - -try { - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq "Continue" - - $EngCommonBaseDir = Join-Path $PSScriptRoot "native\" - $NativeBaseDir = $InstallDirectory - if (!$NativeBaseDir) { - $NativeBaseDir = CommonLibrary\Get-NativeInstallDirectory - } - $Env:CommonLibrary_NativeInstallDir = $NativeBaseDir - $InstallBin = Join-Path $NativeBaseDir "bin" - $InstallerPath = Join-Path $EngCommonBaseDir "install-tool.ps1" - - # Process tools list - Write-Host "Processing $GlobalJsonFile" - If (-Not (Test-Path $GlobalJsonFile)) { - Write-Host "Unable to find '$GlobalJsonFile'" - exit 0 - } - $NativeTools = Get-Content($GlobalJsonFile) -Raw | - ConvertFrom-Json | - Select-Object -Expand "native-tools" -ErrorAction SilentlyContinue - if ($NativeTools) { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $LocalInstallerArguments'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - Write-Warning $errMsg - $toolInstallationFailure = $true - } else { - Write-Error $errMsg - exit 1 - } - } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - exit 1 - } - } - else { - Write-Host "No native tools defined in global.json" - exit 0 - } - - if ($Clean) { - exit 0 - } - if (Test-Path $InstallBin) { - Write-Host "Native tools are available from" (Convert-Path -Path $InstallBin) - Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" - } - else { - Write-Error "Native tools install directory does not exist, installation failed" - exit 1 - } - exit 0 -} -catch { - Write-Host $_ - Write-Host $_.Exception - exit 1 -} +<# +.SYNOPSIS +Entry point script for installing native tools + +.DESCRIPTION +Reads $RepoRoot\global.json file to determine native assets to install +and executes installers for those tools + +.PARAMETER BaseUri +Base file directory or Url from which to acquire tool archives + +.PARAMETER InstallDirectory +Directory to install native toolset. This is a command-line override for the default +Install directory precedence order: +- InstallDirectory command-line override +- NETCOREENG_INSTALL_DIRECTORY environment variable +- (default) %USERPROFILE%/.netcoreeng/native + +.PARAMETER Clean +Switch specifying to not install anything, but cleanup native asset folders + +.PARAMETER Force +Clean and then install tools + +.PARAMETER DownloadRetries +Total number of retry attempts + +.PARAMETER RetryWaitTimeInSeconds +Wait time between retry attempts in seconds + +.PARAMETER GlobalJsonFile +File path to global.json file + +.NOTES +#> +[CmdletBinding(PositionalBinding=$false)] +Param ( + [string] $BaseUri = "https://netcorenativeassets.blob.core.windows.net/resource-packages/external", + [string] $InstallDirectory, + [switch] $Clean = $False, + [switch] $Force = $False, + [int] $DownloadRetries = 5, + [int] $RetryWaitTimeInSeconds = 30, + [string] $GlobalJsonFile +) + +if (!$GlobalJsonFile) { + $GlobalJsonFile = Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName "global.json" +} + +Set-StrictMode -version 2.0 +$ErrorActionPreference="Stop" + +Import-Module -Name (Join-Path $PSScriptRoot "native\CommonLibrary.psm1") + +try { + # Define verbose switch if undefined + $Verbose = $VerbosePreference -Eq "Continue" + + $EngCommonBaseDir = Join-Path $PSScriptRoot "native\" + $NativeBaseDir = $InstallDirectory + if (!$NativeBaseDir) { + $NativeBaseDir = CommonLibrary\Get-NativeInstallDirectory + } + $Env:CommonLibrary_NativeInstallDir = $NativeBaseDir + $InstallBin = Join-Path $NativeBaseDir "bin" + $InstallerPath = Join-Path $EngCommonBaseDir "install-tool.ps1" + + # Process tools list + Write-Host "Processing $GlobalJsonFile" + If (-Not (Test-Path $GlobalJsonFile)) { + Write-Host "Unable to find '$GlobalJsonFile'" + exit 0 + } + $NativeTools = Get-Content($GlobalJsonFile) -Raw | + ConvertFrom-Json | + Select-Object -Expand "native-tools" -ErrorAction SilentlyContinue + if ($NativeTools) { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } + + if ($Verbose) { + $LocalInstallerArguments += @{ Verbose = $True } + } + if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { + if($Force) { + $LocalInstallerArguments += @{ Force = $True } + } + } + if ($Clean) { + $LocalInstallerArguments += @{ Clean = $True } + } + + Write-Verbose "Installing $ToolName version $ToolVersion" + Write-Verbose "Executing '$InstallerPath $LocalInstallerArguments'" + & $InstallerPath @LocalInstallerArguments + if ($LASTEXITCODE -Ne "0") { + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + Write-Warning $errMsg + $toolInstallationFailure = $true + } else { + Write-Error $errMsg + exit 1 + } + } + } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + exit 1 + } + } + else { + Write-Host "No native tools defined in global.json" + exit 0 + } + + if ($Clean) { + exit 0 + } + if (Test-Path $InstallBin) { + Write-Host "Native tools are available from" (Convert-Path -Path $InstallBin) + Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" + } + else { + Write-Error "Native tools install directory does not exist, installation failed" + exit 1 + } + exit 0 +} +catch { + Write-Host $_ + Write-Host $_.Exception + exit 1 +} diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index 1d3df860d5f..fc72d13948e 100644 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -1,141 +1,141 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -base_uri='https://netcorenativeassets.blob.core.windows.net/resource-packages/external' -install_directory='' -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 -global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json" -declare -A native_assets - -. $scriptroot/native/common-library.sh - -while (($# > 0)); do - lowerI="$(echo $1 | awk '{print tolower($0)}')" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installdirectory) - install_directory=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --installdirectory Directory to install native toolset." - echo " This is a command-line override for the default" - echo " Install directory precedence order:" - echo " - InstallDirectory command-line override" - echo " - NETCOREENG_INSTALL_DIRECTORY environment variable" - echo " - (default) %USERPROFILE%/.netcoreeng/native" - echo "" - echo " --clean Switch specifying not to install anything, but cleanup native asset folders" - echo " --force Clean and then install tools" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --baseuri Base URI for where to download native tools from" - echo " --downloadretries Number of times a download should be attempted" - echo " --retrywaittimeseconds Wait time between download attempts" - echo "" - exit 0 - ;; - esac -done - -function ReadGlobalJsonNativeTools { - # Get the native-tools section from the global.json. - local native_tools_section=$(cat $global_json_file | awk '/"native-tools"/,/}/') - # Only extract the contents of the object. - local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}') - native_tools_list=${native_tools_list//[\" ]/} - native_tools_list=${native_tools_list//,/$'\n'} - native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[:space:]')" - - local old_IFS=$IFS - while read -r line; do - # Lines are of the form: 'tool:version' - IFS=: - while read -r key value; do - native_assets[$key]=$value - done <<< "$line" - done <<< "$native_tools_list" - IFS=$old_IFS - - return 0; -} - -native_base_dir=$install_directory -if [[ -z $install_directory ]]; then - native_base_dir=$(GetNativeInstallDirectory) -fi - -install_bin="${native_base_dir}/bin" - -ReadGlobalJsonNativeTools - -if [[ ${#native_assets[@]} -eq 0 ]]; then - echo "No native tools defined in global.json" - exit 0; -else - native_installer_dir="$scriptroot/native" - for tool in "${!native_assets[@]}" - do - tool_version=${native_assets[$tool]} - installer_name="install-$tool.sh" - installer_command="$native_installer_dir/$installer_name" - installer_command+=" --baseuri $base_uri" - installer_command+=" --installpath $install_bin" - installer_command+=" --version $tool_version" - - if [[ $force = true ]]; then - installer_command+=" --force" - fi - - if [[ $clean = true ]]; then - installer_command+=" --clean" - fi - - $installer_command - - if [[ $? != 0 ]]; then - echo "Execution Failed" >&2 - exit 1 - fi - done -fi - -if [[ $clean = true ]]; then - exit 0 -fi - -if [[ -d $install_bin ]]; then - echo "Native tools are available from $install_bin" - echo "##vso[task.prependpath]$install_bin" -else - echo "Native tools install directory does not exist, installation failed" >&2 - exit 1 -fi - -exit 0 +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +base_uri='https://netcorenativeassets.blob.core.windows.net/resource-packages/external' +install_directory='' +clean=false +force=false +download_retries=5 +retry_wait_time_seconds=30 +global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json" +declare -A native_assets + +. $scriptroot/native/common-library.sh + +while (($# > 0)); do + lowerI="$(echo $1 | awk '{print tolower($0)}')" + case $lowerI in + --baseuri) + base_uri=$2 + shift 2 + ;; + --installdirectory) + install_directory=$2 + shift 2 + ;; + --clean) + clean=true + shift 1 + ;; + --force) + force=true + shift 1 + ;; + --downloadretries) + download_retries=$2 + shift 2 + ;; + --retrywaittimeseconds) + retry_wait_time_seconds=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --installdirectory Directory to install native toolset." + echo " This is a command-line override for the default" + echo " Install directory precedence order:" + echo " - InstallDirectory command-line override" + echo " - NETCOREENG_INSTALL_DIRECTORY environment variable" + echo " - (default) %USERPROFILE%/.netcoreeng/native" + echo "" + echo " --clean Switch specifying not to install anything, but cleanup native asset folders" + echo " --force Clean and then install tools" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --baseuri Base URI for where to download native tools from" + echo " --downloadretries Number of times a download should be attempted" + echo " --retrywaittimeseconds Wait time between download attempts" + echo "" + exit 0 + ;; + esac +done + +function ReadGlobalJsonNativeTools { + # Get the native-tools section from the global.json. + local native_tools_section=$(cat $global_json_file | awk '/"native-tools"/,/}/') + # Only extract the contents of the object. + local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}') + native_tools_list=${native_tools_list//[\" ]/} + native_tools_list=${native_tools_list//,/$'\n'} + native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[:space:]')" + + local old_IFS=$IFS + while read -r line; do + # Lines are of the form: 'tool:version' + IFS=: + while read -r key value; do + native_assets[$key]=$value + done <<< "$line" + done <<< "$native_tools_list" + IFS=$old_IFS + + return 0; +} + +native_base_dir=$install_directory +if [[ -z $install_directory ]]; then + native_base_dir=$(GetNativeInstallDirectory) +fi + +install_bin="${native_base_dir}/bin" + +ReadGlobalJsonNativeTools + +if [[ ${#native_assets[@]} -eq 0 ]]; then + echo "No native tools defined in global.json" + exit 0; +else + native_installer_dir="$scriptroot/native" + for tool in "${!native_assets[@]}" + do + tool_version=${native_assets[$tool]} + installer_name="install-$tool.sh" + installer_command="$native_installer_dir/$installer_name" + installer_command+=" --baseuri $base_uri" + installer_command+=" --installpath $install_bin" + installer_command+=" --version $tool_version" + + if [[ $force = true ]]; then + installer_command+=" --force" + fi + + if [[ $clean = true ]]; then + installer_command+=" --clean" + fi + + $installer_command + + if [[ $? != 0 ]]; then + echo "Execution Failed" >&2 + exit 1 + fi + done +fi + +if [[ $clean = true ]]; then + exit 0 +fi + +if [[ -d $install_bin ]]; then + echo "Native tools are available from $install_bin" + echo "##vso[task.prependpath]$install_bin" +else + echo "Native tools install directory does not exist, installation failed" >&2 + exit 1 +fi + +exit 0 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index f1a55ac19b9..8b8bafd6a89 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -1,135 +1,135 @@ -param( - [Parameter(Mandatory=$true)][string] $Operation, - [string] $AuthToken, - [string] $CommitSha, - [string] $RepoName, - [switch] $IsFeedPrivate -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\tools.ps1 - -# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed -# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in -# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. This should ONLY be called from identified -# internal builds -function SetupCredProvider { - param( - [string] $AuthToken - ) - - # Install the Cred Provider NuGet plugin - Write-Host "Setting up Cred Provider NuGet plugin in the agent..." - Write-Host "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." - - $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' - - Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 - - Write-Host "Installing plugin..." - .\installcredprovider.ps1 -Force - - Write-Host "Deleting local copy of 'installcredprovider.ps1'..." - Remove-Item .\installcredprovider.ps1 - - if (-Not("$env:USERPROFILE\.nuget\plugins\netcore")) { - Write-Host "CredProvider plugin was not installed correctly!" - ExitWithExitCode 1 - } - else { - Write-Host "CredProvider plugin was installed correctly!" - } - - # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable - # feeds successfully - - $nugetConfigPath = "$RepoRoot\NuGet.config" - - if (-Not (Test-Path -Path $nugetConfigPath)) { - Write-Host "NuGet.config file not found in repo's root!" - ExitWithExitCode 1 - } - - $endpoints = New-Object System.Collections.ArrayList - $nugetConfigPackageSources = Select-Xml -Path $nugetConfigPath -XPath "//packageSources/add[contains(@key, 'darc-int-')]/@value" | foreach{$_.Node.Value} - - if (($nugetConfigPackageSources | Measure-Object).Count -gt 0 ) { - foreach ($stableRestoreResource in $nugetConfigPackageSources) { - $trimmedResource = ([string]$stableRestoreResource).Trim() - [void]$endpoints.Add(@{endpoint="$trimmedResource"; password="$AuthToken"}) - } - } - - if (($endpoints | Measure-Object).Count -gt 0) { - # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' - $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress - - # Create the environment variables the AzDo way - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $endpointCredentials -Properties @{ - 'variable' = 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' - 'issecret' = 'false' - } - - # We don't want sessions cached since we will be updating the endpoints quite frequently - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data 'False' -Properties @{ - 'variable' = 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' - 'issecret' = 'false' - } - } - else - { - Write-Host "No internal endpoints found in NuGet.config" - } -} - -#Workaround for https://github.com/microsoft/msbuild/issues/4430 -function InstallDotNetSdkAndRestoreArcade { - $dotnetTempDir = "$RepoRoot\dotnet" - $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) - $dotnet = "$dotnetTempDir\dotnet.exe" - $restoreProjPath = "$PSScriptRoot\restore.proj" - - Write-Host "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." - InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" - - '' | Out-File "$restoreProjPath" - - & $dotnet restore $restoreProjPath - - Write-Host "Arcade SDK restored!" - - if (Test-Path -Path $restoreProjPath) { - Remove-Item $restoreProjPath - } - - if (Test-Path -Path $dotnetTempDir) { - Remove-Item $dotnetTempDir -Recurse - } -} - -try { - Push-Location $PSScriptRoot - - if ($Operation -like "setup") { - SetupCredProvider $AuthToken - } - elseif ($Operation -like "install-restore") { - InstallDotNetSdkAndRestoreArcade - } - else { - Write-Host "Unknown operation '$Operation'!" - ExitWithExitCode 1 - } -} -catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - ExitWithExitCode 1 -} -finally { - Pop-Location -} +param( + [Parameter(Mandatory=$true)][string] $Operation, + [string] $AuthToken, + [string] $CommitSha, + [string] $RepoName, + [switch] $IsFeedPrivate +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\tools.ps1 + +# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed +# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in +# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. This should ONLY be called from identified +# internal builds +function SetupCredProvider { + param( + [string] $AuthToken + ) + + # Install the Cred Provider NuGet plugin + Write-Host "Setting up Cred Provider NuGet plugin in the agent..." + Write-Host "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." + + $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' + + Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." + Invoke-WebRequest $url -OutFile installcredprovider.ps1 + + Write-Host "Installing plugin..." + .\installcredprovider.ps1 -Force + + Write-Host "Deleting local copy of 'installcredprovider.ps1'..." + Remove-Item .\installcredprovider.ps1 + + if (-Not("$env:USERPROFILE\.nuget\plugins\netcore")) { + Write-Host "CredProvider plugin was not installed correctly!" + ExitWithExitCode 1 + } + else { + Write-Host "CredProvider plugin was installed correctly!" + } + + # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable + # feeds successfully + + $nugetConfigPath = "$RepoRoot\NuGet.config" + + if (-Not (Test-Path -Path $nugetConfigPath)) { + Write-Host "NuGet.config file not found in repo's root!" + ExitWithExitCode 1 + } + + $endpoints = New-Object System.Collections.ArrayList + $nugetConfigPackageSources = Select-Xml -Path $nugetConfigPath -XPath "//packageSources/add[contains(@key, 'darc-int-')]/@value" | foreach{$_.Node.Value} + + if (($nugetConfigPackageSources | Measure-Object).Count -gt 0 ) { + foreach ($stableRestoreResource in $nugetConfigPackageSources) { + $trimmedResource = ([string]$stableRestoreResource).Trim() + [void]$endpoints.Add(@{endpoint="$trimmedResource"; password="$AuthToken"}) + } + } + + if (($endpoints | Measure-Object).Count -gt 0) { + # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' + $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress + + # Create the environment variables the AzDo way + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $endpointCredentials -Properties @{ + 'variable' = 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' + 'issecret' = 'false' + } + + # We don't want sessions cached since we will be updating the endpoints quite frequently + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data 'False' -Properties @{ + 'variable' = 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' + 'issecret' = 'false' + } + } + else + { + Write-Host "No internal endpoints found in NuGet.config" + } +} + +#Workaround for https://github.com/microsoft/msbuild/issues/4430 +function InstallDotNetSdkAndRestoreArcade { + $dotnetTempDir = "$RepoRoot\dotnet" + $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) + $dotnet = "$dotnetTempDir\dotnet.exe" + $restoreProjPath = "$PSScriptRoot\restore.proj" + + Write-Host "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." + InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" + + '' | Out-File "$restoreProjPath" + + & $dotnet restore $restoreProjPath + + Write-Host "Arcade SDK restored!" + + if (Test-Path -Path $restoreProjPath) { + Remove-Item $restoreProjPath + } + + if (Test-Path -Path $dotnetTempDir) { + Remove-Item $dotnetTempDir -Recurse + } +} + +try { + Push-Location $PSScriptRoot + + if ($Operation -like "setup") { + SetupCredProvider $AuthToken + } + elseif ($Operation -like "install-restore") { + InstallDotNetSdkAndRestoreArcade + } + else { + Write-Host "Unknown operation '$Operation'!" + ExitWithExitCode 1 + } +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} +finally { + Pop-Location +} diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index cdf8c62edb5..1ff654d2ffc 100644 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -1,142 +1,142 @@ -#!/usr/bin/env bash - -set -e - -# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed -# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in -# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. -# This should ONLY be called from identified internal builds -function SetupCredProvider { - local authToken=$1 - - # Install the Cred Provider NuGet plugin - echo "Setting up Cred Provider NuGet plugin in the agent..."... - echo "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." - - local url="https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh" - - echo "Writing the contents of 'installcredprovider.ps1' locally..." - local installcredproviderPath="installcredprovider.sh" - if command -v curl > /dev/null; then - curl $url > "$installcredproviderPath" - else - wget -q -O "$installcredproviderPath" "$url" - fi - - echo "Installing plugin..." - . "$installcredproviderPath" - - echo "Deleting local copy of 'installcredprovider.sh'..." - rm installcredprovider.sh - - if [ ! -d "$HOME/.nuget/plugins" ]; then - echo "CredProvider plugin was not installed correctly!" - ExitWithExitCode 1 - else - echo "CredProvider plugin was installed correctly!" - fi - - # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable - # feeds successfully - - local nugetConfigPath="$repo_root/NuGet.config" - - if [ ! "$nugetConfigPath" ]; then - echo "NuGet.config file not found in repo's root!" - ExitWithExitCode 1 - fi - - local endpoints='[' - local nugetConfigPackageValues=`cat "$nugetConfigPath" | grep "key=\"darc-int-"` - local pattern="value=\"(.*)\"" - - for value in $nugetConfigPackageValues - do - if [[ $value =~ $pattern ]]; then - local endpoint="${BASH_REMATCH[1]}" - endpoints+="{\"endpoint\": \"$endpoint\", \"password\": \"$authToken\"}," - fi - done - - endpoints=${endpoints%?} - endpoints+=']' - - if [ ${#endpoints} -gt 2 ]; then - # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' - local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" - - echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" - echo "##vso[task.setvariable variable=NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED]False" - else - echo "No internal endpoints found in NuGet.config" - fi -} - -# Workaround for https://github.com/microsoft/msbuild/issues/4430 -function InstallDotNetSdkAndRestoreArcade { - local dotnetTempDir="$repo_root/dotnet" - local dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) - local restoreProjPath="$repo_root/eng/common/restore.proj" - - echo "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." - echo "" > "$restoreProjPath" - - InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" - - local res=`$dotnetTempDir/dotnet restore $restoreProjPath` - echo "Arcade SDK restored!" - - # Cleanup - if [ "$restoreProjPath" ]; then - rm "$restoreProjPath" - fi - - if [ "$dotnetTempDir" ]; then - rm -r $dotnetTempDir - fi -} - -source="${BASH_SOURCE[0]}" -operation='' -authToken='' -repoName='' - -while [[ $# > 0 ]]; do - opt="$(echo "$1" | awk '{print tolower($0)}')" - case "$opt" in - --operation) - operation=$2 - shift - ;; - --authtoken) - authToken=$2 - shift - ;; - *) - echo "Invalid argument: $1" - usage - exit 1 - ;; - esac - - shift -done - -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. "$scriptroot/tools.sh" - -if [ "$operation" = "setup" ]; then - SetupCredProvider $authToken -elif [ "$operation" = "install-restore" ]; then - InstallDotNetSdkAndRestoreArcade -else - echo "Unknown operation '$operation'!" -fi +#!/usr/bin/env bash + +set -e + +# Sets VSS_NUGET_EXTERNAL_FEED_ENDPOINTS based on the "darc-int-*" feeds defined in NuGet.config. This is needed +# in build agents by CredProvider to authenticate the restore requests to internal feeds as specified in +# https://github.com/microsoft/artifacts-credprovider/blob/0f53327cd12fd893d8627d7b08a2171bf5852a41/README.md#environment-variables. +# This should ONLY be called from identified internal builds +function SetupCredProvider { + local authToken=$1 + + # Install the Cred Provider NuGet plugin + echo "Setting up Cred Provider NuGet plugin in the agent..."... + echo "Getting 'installcredprovider.ps1' from 'https://github.com/microsoft/artifacts-credprovider'..." + + local url="https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh" + + echo "Writing the contents of 'installcredprovider.ps1' locally..." + local installcredproviderPath="installcredprovider.sh" + if command -v curl > /dev/null; then + curl $url > "$installcredproviderPath" + else + wget -q -O "$installcredproviderPath" "$url" + fi + + echo "Installing plugin..." + . "$installcredproviderPath" + + echo "Deleting local copy of 'installcredprovider.sh'..." + rm installcredprovider.sh + + if [ ! -d "$HOME/.nuget/plugins" ]; then + echo "CredProvider plugin was not installed correctly!" + ExitWithExitCode 1 + else + echo "CredProvider plugin was installed correctly!" + fi + + # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable + # feeds successfully + + local nugetConfigPath="$repo_root/NuGet.config" + + if [ ! "$nugetConfigPath" ]; then + echo "NuGet.config file not found in repo's root!" + ExitWithExitCode 1 + fi + + local endpoints='[' + local nugetConfigPackageValues=`cat "$nugetConfigPath" | grep "key=\"darc-int-"` + local pattern="value=\"(.*)\"" + + for value in $nugetConfigPackageValues + do + if [[ $value =~ $pattern ]]; then + local endpoint="${BASH_REMATCH[1]}" + endpoints+="{\"endpoint\": \"$endpoint\", \"password\": \"$authToken\"}," + fi + done + + endpoints=${endpoints%?} + endpoints+=']' + + if [ ${#endpoints} -gt 2 ]; then + # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' + local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" + + echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" + echo "##vso[task.setvariable variable=NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED]False" + else + echo "No internal endpoints found in NuGet.config" + fi +} + +# Workaround for https://github.com/microsoft/msbuild/issues/4430 +function InstallDotNetSdkAndRestoreArcade { + local dotnetTempDir="$repo_root/dotnet" + local dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) + local restoreProjPath="$repo_root/eng/common/restore.proj" + + echo "Installing dotnet SDK version $dotnetSdkVersion to restore Arcade SDK..." + echo "" > "$restoreProjPath" + + InstallDotNetSdk "$dotnetTempDir" "$dotnetSdkVersion" + + local res=`$dotnetTempDir/dotnet restore $restoreProjPath` + echo "Arcade SDK restored!" + + # Cleanup + if [ "$restoreProjPath" ]; then + rm "$restoreProjPath" + fi + + if [ "$dotnetTempDir" ]; then + rm -r $dotnetTempDir + fi +} + +source="${BASH_SOURCE[0]}" +operation='' +authToken='' +repoName='' + +while [[ $# > 0 ]]; do + opt="$(echo "$1" | awk '{print tolower($0)}')" + case "$opt" in + --operation) + operation=$2 + shift + ;; + --authtoken) + authToken=$2 + shift + ;; + *) + echo "Invalid argument: $1" + usage + exit 1 + ;; + esac + + shift +done + +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ "$operation" = "setup" ]; then + SetupCredProvider $authToken +elif [ "$operation" = "install-restore" ]; then + InstallDotNetSdkAndRestoreArcade +else + echo "Unknown operation '$operation'!" +fi diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props index d554b8a63d0..e33179ef373 100644 --- a/eng/common/internal/Directory.Build.props +++ b/eng/common/internal/Directory.Build.props @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index a70213f3071..1a39a7ef3f6 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,27 +1,27 @@ - - - - - net472 - false - - - - - - - - - - - https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - - $(RestoreSources); - https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - - - - - - + + + + + net472 + false + + + + + + + + + + + https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; + + + $(RestoreSources); + https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; + + + + + + diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index 7b585ad9ec2..b37fd3d5e97 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -1,27 +1,27 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $verbosity = "minimal", - [bool] $warnAsError = $true, - [bool] $nodeReuse = $true, - [switch] $ci, - [switch] $prepareMachine, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs -) - -. $PSScriptRoot\tools.ps1 - -try { - if ($ci) { - $nodeReuse = $false - } - - MSBuild @extraArgs -} -catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - ExitWithExitCode 1 -} - +[CmdletBinding(PositionalBinding=$false)] +Param( + [string] $verbosity = "minimal", + [bool] $warnAsError = $true, + [bool] $nodeReuse = $true, + [switch] $ci, + [switch] $prepareMachine, + [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs +) + +. $PSScriptRoot\tools.ps1 + +try { + if ($ci) { + $nodeReuse = $false + } + + MSBuild @extraArgs +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} + ExitWithExitCode 0 \ No newline at end of file diff --git a/eng/common/msbuild.sh b/eng/common/msbuild.sh index 396fbe76498..8160cd5a59d 100755 --- a/eng/common/msbuild.sh +++ b/eng/common/msbuild.sh @@ -1,58 +1,58 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $source until the file is no longer a symlink -while [[ -h "$source" ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -verbosity='minimal' -warn_as_error=true -node_reuse=true -prepare_machine=false -extra_args='' - -while (($# > 0)); do - lowerI="$(echo $1 | awk '{print tolower($0)}')" - case $lowerI in - --verbosity) - verbosity=$2 - shift 2 - ;; - --warnaserror) - warn_as_error=$2 - shift 2 - ;; - --nodereuse) - node_reuse=$2 - shift 2 - ;; - --ci) - ci=true - shift 1 - ;; - --preparemachine) - prepare_machine=true - shift 1 - ;; - *) - extra_args="$extra_args $1" - shift 1 - ;; - esac -done - -. "$scriptroot/tools.sh" - -if [[ "$ci" == true ]]; then - node_reuse=false -fi - -MSBuild $extra_args -ExitWithExitCode 0 +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +verbosity='minimal' +warn_as_error=true +node_reuse=true +prepare_machine=false +extra_args='' + +while (($# > 0)); do + lowerI="$(echo $1 | awk '{print tolower($0)}')" + case $lowerI in + --verbosity) + verbosity=$2 + shift 2 + ;; + --warnaserror) + warn_as_error=$2 + shift 2 + ;; + --nodereuse) + node_reuse=$2 + shift 2 + ;; + --ci) + ci=true + shift 1 + ;; + --preparemachine) + prepare_machine=true + shift 1 + ;; + *) + extra_args="$extra_args $1" + shift 1 + ;; + esac +done + +. "$scriptroot/tools.sh" + +if [[ "$ci" == true ]]; then + node_reuse=false +fi + +MSBuild $extra_args +ExitWithExitCode 0 diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index bbae72055e2..7a34c7e8a42 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -1,358 +1,358 @@ -<# -.SYNOPSIS -Helper module to install an archive to a directory - -.DESCRIPTION -Helper module to download and extract an archive to a specified directory - -.PARAMETER Uri -Uri of artifact to download - -.PARAMETER InstallDirectory -Directory to extract artifact contents to - -.PARAMETER Force -Force download / extraction if file or contents already exist. Default = False - -.PARAMETER DownloadRetries -Total number of retry attempts. Default = 5 - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds. Default = 30 - -.NOTES -Returns False if download or extraction fail, True otherwise -#> -function DownloadAndExtract { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $Uri, - [Parameter(Mandatory=$True)] - [string] $InstallDirectory, - [switch] $Force = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30 - ) - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq "Continue" - - $TempToolPath = CommonLibrary\Get-TempPathFilename -Path $Uri - - # Download native tool - $DownloadStatus = CommonLibrary\Get-File -Uri $Uri ` - -Path $TempToolPath ` - -DownloadRetries $DownloadRetries ` - -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` - -Force:$Force ` - -Verbose:$Verbose - - if ($DownloadStatus -Eq $False) { - Write-Error "Download failed" - return $False - } - - # Extract native tool - $UnzipStatus = CommonLibrary\Expand-Zip -ZipPath $TempToolPath ` - -OutputDirectory $InstallDirectory ` - -Force:$Force ` - -Verbose:$Verbose - - if ($UnzipStatus -Eq $False) { - Write-Error "Unzip failed" - return $False - } - return $True -} - -<# -.SYNOPSIS -Download a file, retry on failure - -.DESCRIPTION -Download specified file and retry if attempt fails - -.PARAMETER Uri -Uri of file to download. If Uri is a local path, the file will be copied instead of downloaded - -.PARAMETER Path -Path to download or copy uri file to - -.PARAMETER Force -Overwrite existing file if present. Default = False - -.PARAMETER DownloadRetries -Total number of retry attempts. Default = 5 - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds Default = 30 - -#> -function Get-File { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $Uri, - [Parameter(Mandatory=$True)] - [string] $Path, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30, - [switch] $Force = $False - ) - $Attempt = 0 - - if ($Force) { - if (Test-Path $Path) { - Remove-Item $Path -Force - } - } - if (Test-Path $Path) { - Write-Host "File '$Path' already exists, skipping download" - return $True - } - - $DownloadDirectory = Split-Path -ErrorAction Ignore -Path "$Path" -Parent - if (-Not (Test-Path $DownloadDirectory)) { - New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null - } - - if (Test-Path -IsValid -Path $Uri) { - Write-Verbose "'$Uri' is a file path, copying file to '$Path'" - Copy-Item -Path $Uri -Destination $Path - return $? - } - else { - Write-Verbose "Downloading $Uri" - while($Attempt -Lt $DownloadRetries) - { - try { - Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $Path - Write-Verbose "Downloaded to '$Path'" - return $True - } - catch { - $Attempt++ - if ($Attempt -Lt $DownloadRetries) { - $AttemptsLeft = $DownloadRetries - $Attempt - Write-Warning "Download failed, $AttemptsLeft attempts remaining, will retry in $RetryWaitTimeInSeconds seconds" - Start-Sleep -Seconds $RetryWaitTimeInSeconds - } - else { - Write-Error $_ - Write-Error $_.Exception - } - } - } - } - - return $False -} - -<# -.SYNOPSIS -Generate a shim for a native tool - -.DESCRIPTION -Creates a wrapper script (shim) that passes arguments forward to native tool assembly - -.PARAMETER ShimName -The name of the shim - -.PARAMETER ShimDirectory -The directory where shims are stored - -.PARAMETER ToolFilePath -Path to file that shim forwards to - -.PARAMETER Force -Replace shim if already present. Default = False - -.NOTES -Returns $True if generating shim succeeds, $False otherwise -#> -function New-ScriptShim { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $ShimName, - [Parameter(Mandatory=$True)] - [string] $ShimDirectory, - [Parameter(Mandatory=$True)] - [string] $ToolFilePath, - [Parameter(Mandatory=$True)] - [string] $BaseUri, - [switch] $Force - ) - try { - Write-Verbose "Generating '$ShimName' shim" - - if (-Not (Test-Path $ToolFilePath)){ - Write-Error "Specified tool file path '$ToolFilePath' does not exist" - return $False - } - - # WinShimmer is a small .NET Framework program that creates .exe shims to bootstrapped programs - # Many of the checks for installed programs expect a .exe extension for Windows tools, rather - # than a .bat or .cmd file. - # Source: https://github.com/dotnet/arcade/tree/master/src/WinShimmer - if (-Not (Test-Path "$ShimDirectory\WinShimmer\winshimmer.exe")) { - $InstallStatus = DownloadAndExtract -Uri "$BaseUri/windows/winshimmer/WinShimmer.zip" ` - -InstallDirectory $ShimDirectory\WinShimmer ` - -Force:$Force ` - -DownloadRetries 2 ` - -RetryWaitTimeInSeconds 5 ` - -Verbose:$Verbose - } - - if ((Test-Path (Join-Path $ShimDirectory "$ShimName.exe"))) { - Write-Host "$ShimName.exe already exists; replacing..." - Remove-Item (Join-Path $ShimDirectory "$ShimName.exe") - } - - & "$ShimDirectory\WinShimmer\winshimmer.exe" $ShimName $ToolFilePath $ShimDirectory - return $True - } - catch { - Write-Host $_ - Write-Host $_.Exception - return $False - } -} - -<# -.SYNOPSIS -Returns the machine architecture of the host machine - -.NOTES -Returns 'x64' on 64 bit machines - Returns 'x86' on 32 bit machines -#> -function Get-MachineArchitecture { - $ProcessorArchitecture = $Env:PROCESSOR_ARCHITECTURE - $ProcessorArchitectureW6432 = $Env:PROCESSOR_ARCHITEW6432 - if($ProcessorArchitecture -Eq "X86") - { - if(($ProcessorArchitectureW6432 -Eq "") -Or - ($ProcessorArchitectureW6432 -Eq "X86")) { - return "x86" - } - $ProcessorArchitecture = $ProcessorArchitectureW6432 - } - if (($ProcessorArchitecture -Eq "AMD64") -Or - ($ProcessorArchitecture -Eq "IA64") -Or - ($ProcessorArchitecture -Eq "ARM64")) { - return "x64" - } - return "x86" -} - -<# -.SYNOPSIS -Get the name of a temporary folder under the native install directory -#> -function Get-TempDirectory { - return Join-Path (Get-NativeInstallDirectory) "temp/" -} - -function Get-TempPathFilename { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $Path - ) - $TempDir = CommonLibrary\Get-TempDirectory - $TempFilename = Split-Path $Path -leaf - $TempPath = Join-Path $TempDir $TempFilename - return $TempPath -} - -<# -.SYNOPSIS -Returns the base directory to use for native tool installation - -.NOTES -Returns the value of the NETCOREENG_INSTALL_DIRECTORY if that environment variable -is set, or otherwise returns an install directory under the %USERPROFILE% -#> -function Get-NativeInstallDirectory { - $InstallDir = $Env:NETCOREENG_INSTALL_DIRECTORY - if (!$InstallDir) { - $InstallDir = Join-Path $Env:USERPROFILE ".netcoreeng/native/" - } - return $InstallDir -} - -<# -.SYNOPSIS -Unzip an archive - -.DESCRIPTION -Powershell module to unzip an archive to a specified directory - -.PARAMETER ZipPath (Required) -Path to archive to unzip - -.PARAMETER OutputDirectory (Required) -Output directory for archive contents - -.PARAMETER Force -Overwrite output directory contents if they already exist - -.NOTES -- Returns True and does not perform an extraction if output directory already exists but Overwrite is not True. -- Returns True if unzip operation is successful -- Returns False if Overwrite is True and it is unable to remove contents of OutputDirectory -- Returns False if unable to extract zip archive -#> -function Expand-Zip { - [CmdletBinding(PositionalBinding=$false)] - Param ( - [Parameter(Mandatory=$True)] - [string] $ZipPath, - [Parameter(Mandatory=$True)] - [string] $OutputDirectory, - [switch] $Force - ) - - Write-Verbose "Extracting '$ZipPath' to '$OutputDirectory'" - try { - if ((Test-Path $OutputDirectory) -And (-Not $Force)) { - Write-Host "Directory '$OutputDirectory' already exists, skipping extract" - return $True - } - if (Test-Path $OutputDirectory) { - Write-Verbose "'Force' is 'True', but '$OutputDirectory' exists, removing directory" - Remove-Item $OutputDirectory -Force -Recurse - if ($? -Eq $False) { - Write-Error "Unable to remove '$OutputDirectory'" - return $False - } - } - if (-Not (Test-Path $OutputDirectory)) { - New-Item -path $OutputDirectory -Force -itemType "Directory" | Out-Null - } - - Add-Type -assembly "system.io.compression.filesystem" - [io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$OutputDirectory") - if ($? -Eq $False) { - Write-Error "Unable to extract '$ZipPath'" - return $False - } - } - catch { - Write-Host $_ - Write-Host $_.Exception - - return $False - } - return $True -} - -export-modulemember -function DownloadAndExtract -export-modulemember -function Expand-Zip -export-modulemember -function Get-File -export-modulemember -function Get-MachineArchitecture -export-modulemember -function Get-NativeInstallDirectory -export-modulemember -function Get-TempDirectory -export-modulemember -function Get-TempPathFilename -export-modulemember -function New-ScriptShim +<# +.SYNOPSIS +Helper module to install an archive to a directory + +.DESCRIPTION +Helper module to download and extract an archive to a specified directory + +.PARAMETER Uri +Uri of artifact to download + +.PARAMETER InstallDirectory +Directory to extract artifact contents to + +.PARAMETER Force +Force download / extraction if file or contents already exist. Default = False + +.PARAMETER DownloadRetries +Total number of retry attempts. Default = 5 + +.PARAMETER RetryWaitTimeInSeconds +Wait time between retry attempts in seconds. Default = 30 + +.NOTES +Returns False if download or extraction fail, True otherwise +#> +function DownloadAndExtract { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $Uri, + [Parameter(Mandatory=$True)] + [string] $InstallDirectory, + [switch] $Force = $False, + [int] $DownloadRetries = 5, + [int] $RetryWaitTimeInSeconds = 30 + ) + # Define verbose switch if undefined + $Verbose = $VerbosePreference -Eq "Continue" + + $TempToolPath = CommonLibrary\Get-TempPathFilename -Path $Uri + + # Download native tool + $DownloadStatus = CommonLibrary\Get-File -Uri $Uri ` + -Path $TempToolPath ` + -DownloadRetries $DownloadRetries ` + -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` + -Force:$Force ` + -Verbose:$Verbose + + if ($DownloadStatus -Eq $False) { + Write-Error "Download failed" + return $False + } + + # Extract native tool + $UnzipStatus = CommonLibrary\Expand-Zip -ZipPath $TempToolPath ` + -OutputDirectory $InstallDirectory ` + -Force:$Force ` + -Verbose:$Verbose + + if ($UnzipStatus -Eq $False) { + Write-Error "Unzip failed" + return $False + } + return $True +} + +<# +.SYNOPSIS +Download a file, retry on failure + +.DESCRIPTION +Download specified file and retry if attempt fails + +.PARAMETER Uri +Uri of file to download. If Uri is a local path, the file will be copied instead of downloaded + +.PARAMETER Path +Path to download or copy uri file to + +.PARAMETER Force +Overwrite existing file if present. Default = False + +.PARAMETER DownloadRetries +Total number of retry attempts. Default = 5 + +.PARAMETER RetryWaitTimeInSeconds +Wait time between retry attempts in seconds Default = 30 + +#> +function Get-File { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $Uri, + [Parameter(Mandatory=$True)] + [string] $Path, + [int] $DownloadRetries = 5, + [int] $RetryWaitTimeInSeconds = 30, + [switch] $Force = $False + ) + $Attempt = 0 + + if ($Force) { + if (Test-Path $Path) { + Remove-Item $Path -Force + } + } + if (Test-Path $Path) { + Write-Host "File '$Path' already exists, skipping download" + return $True + } + + $DownloadDirectory = Split-Path -ErrorAction Ignore -Path "$Path" -Parent + if (-Not (Test-Path $DownloadDirectory)) { + New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null + } + + if (Test-Path -IsValid -Path $Uri) { + Write-Verbose "'$Uri' is a file path, copying file to '$Path'" + Copy-Item -Path $Uri -Destination $Path + return $? + } + else { + Write-Verbose "Downloading $Uri" + while($Attempt -Lt $DownloadRetries) + { + try { + Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $Path + Write-Verbose "Downloaded to '$Path'" + return $True + } + catch { + $Attempt++ + if ($Attempt -Lt $DownloadRetries) { + $AttemptsLeft = $DownloadRetries - $Attempt + Write-Warning "Download failed, $AttemptsLeft attempts remaining, will retry in $RetryWaitTimeInSeconds seconds" + Start-Sleep -Seconds $RetryWaitTimeInSeconds + } + else { + Write-Error $_ + Write-Error $_.Exception + } + } + } + } + + return $False +} + +<# +.SYNOPSIS +Generate a shim for a native tool + +.DESCRIPTION +Creates a wrapper script (shim) that passes arguments forward to native tool assembly + +.PARAMETER ShimName +The name of the shim + +.PARAMETER ShimDirectory +The directory where shims are stored + +.PARAMETER ToolFilePath +Path to file that shim forwards to + +.PARAMETER Force +Replace shim if already present. Default = False + +.NOTES +Returns $True if generating shim succeeds, $False otherwise +#> +function New-ScriptShim { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $ShimName, + [Parameter(Mandatory=$True)] + [string] $ShimDirectory, + [Parameter(Mandatory=$True)] + [string] $ToolFilePath, + [Parameter(Mandatory=$True)] + [string] $BaseUri, + [switch] $Force + ) + try { + Write-Verbose "Generating '$ShimName' shim" + + if (-Not (Test-Path $ToolFilePath)){ + Write-Error "Specified tool file path '$ToolFilePath' does not exist" + return $False + } + + # WinShimmer is a small .NET Framework program that creates .exe shims to bootstrapped programs + # Many of the checks for installed programs expect a .exe extension for Windows tools, rather + # than a .bat or .cmd file. + # Source: https://github.com/dotnet/arcade/tree/master/src/WinShimmer + if (-Not (Test-Path "$ShimDirectory\WinShimmer\winshimmer.exe")) { + $InstallStatus = DownloadAndExtract -Uri "$BaseUri/windows/winshimmer/WinShimmer.zip" ` + -InstallDirectory $ShimDirectory\WinShimmer ` + -Force:$Force ` + -DownloadRetries 2 ` + -RetryWaitTimeInSeconds 5 ` + -Verbose:$Verbose + } + + if ((Test-Path (Join-Path $ShimDirectory "$ShimName.exe"))) { + Write-Host "$ShimName.exe already exists; replacing..." + Remove-Item (Join-Path $ShimDirectory "$ShimName.exe") + } + + & "$ShimDirectory\WinShimmer\winshimmer.exe" $ShimName $ToolFilePath $ShimDirectory + return $True + } + catch { + Write-Host $_ + Write-Host $_.Exception + return $False + } +} + +<# +.SYNOPSIS +Returns the machine architecture of the host machine + +.NOTES +Returns 'x64' on 64 bit machines + Returns 'x86' on 32 bit machines +#> +function Get-MachineArchitecture { + $ProcessorArchitecture = $Env:PROCESSOR_ARCHITECTURE + $ProcessorArchitectureW6432 = $Env:PROCESSOR_ARCHITEW6432 + if($ProcessorArchitecture -Eq "X86") + { + if(($ProcessorArchitectureW6432 -Eq "") -Or + ($ProcessorArchitectureW6432 -Eq "X86")) { + return "x86" + } + $ProcessorArchitecture = $ProcessorArchitectureW6432 + } + if (($ProcessorArchitecture -Eq "AMD64") -Or + ($ProcessorArchitecture -Eq "IA64") -Or + ($ProcessorArchitecture -Eq "ARM64")) { + return "x64" + } + return "x86" +} + +<# +.SYNOPSIS +Get the name of a temporary folder under the native install directory +#> +function Get-TempDirectory { + return Join-Path (Get-NativeInstallDirectory) "temp/" +} + +function Get-TempPathFilename { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $Path + ) + $TempDir = CommonLibrary\Get-TempDirectory + $TempFilename = Split-Path $Path -leaf + $TempPath = Join-Path $TempDir $TempFilename + return $TempPath +} + +<# +.SYNOPSIS +Returns the base directory to use for native tool installation + +.NOTES +Returns the value of the NETCOREENG_INSTALL_DIRECTORY if that environment variable +is set, or otherwise returns an install directory under the %USERPROFILE% +#> +function Get-NativeInstallDirectory { + $InstallDir = $Env:NETCOREENG_INSTALL_DIRECTORY + if (!$InstallDir) { + $InstallDir = Join-Path $Env:USERPROFILE ".netcoreeng/native/" + } + return $InstallDir +} + +<# +.SYNOPSIS +Unzip an archive + +.DESCRIPTION +Powershell module to unzip an archive to a specified directory + +.PARAMETER ZipPath (Required) +Path to archive to unzip + +.PARAMETER OutputDirectory (Required) +Output directory for archive contents + +.PARAMETER Force +Overwrite output directory contents if they already exist + +.NOTES +- Returns True and does not perform an extraction if output directory already exists but Overwrite is not True. +- Returns True if unzip operation is successful +- Returns False if Overwrite is True and it is unable to remove contents of OutputDirectory +- Returns False if unable to extract zip archive +#> +function Expand-Zip { + [CmdletBinding(PositionalBinding=$false)] + Param ( + [Parameter(Mandatory=$True)] + [string] $ZipPath, + [Parameter(Mandatory=$True)] + [string] $OutputDirectory, + [switch] $Force + ) + + Write-Verbose "Extracting '$ZipPath' to '$OutputDirectory'" + try { + if ((Test-Path $OutputDirectory) -And (-Not $Force)) { + Write-Host "Directory '$OutputDirectory' already exists, skipping extract" + return $True + } + if (Test-Path $OutputDirectory) { + Write-Verbose "'Force' is 'True', but '$OutputDirectory' exists, removing directory" + Remove-Item $OutputDirectory -Force -Recurse + if ($? -Eq $False) { + Write-Error "Unable to remove '$OutputDirectory'" + return $False + } + } + if (-Not (Test-Path $OutputDirectory)) { + New-Item -path $OutputDirectory -Force -itemType "Directory" | Out-Null + } + + Add-Type -assembly "system.io.compression.filesystem" + [io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$OutputDirectory") + if ($? -Eq $False) { + Write-Error "Unable to extract '$ZipPath'" + return $False + } + } + catch { + Write-Host $_ + Write-Host $_.Exception + + return $False + } + return $True +} + +export-modulemember -function DownloadAndExtract +export-modulemember -function Expand-Zip +export-modulemember -function Get-File +export-modulemember -function Get-MachineArchitecture +export-modulemember -function Get-NativeInstallDirectory +export-modulemember -function Get-TempDirectory +export-modulemember -function Get-TempPathFilename +export-modulemember -function New-ScriptShim diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh index fcbddad9ce2..271bddfac5a 100644 --- a/eng/common/native/common-library.sh +++ b/eng/common/native/common-library.sh @@ -1,168 +1,168 @@ -#!/usr/bin/env bash - -function GetNativeInstallDirectory { - local install_dir - - if [[ -z $NETCOREENG_INSTALL_DIRECTORY ]]; then - install_dir=$HOME/.netcoreeng/native/ - else - install_dir=$NETCOREENG_INSTALL_DIRECTORY - fi - - echo $install_dir - return 0 -} - -function GetTempDirectory { - - echo $(GetNativeInstallDirectory)temp/ - return 0 -} - -function ExpandZip { - local zip_path=$1 - local output_directory=$2 - local force=${3:-false} - - echo "Extracting $zip_path to $output_directory" - if [[ -d $output_directory ]] && [[ $force = false ]]; then - echo "Directory '$output_directory' already exists, skipping extract" - return 0 - fi - - if [[ -d $output_directory ]]; then - echo "'Force flag enabled, but '$output_directory' exists. Removing directory" - rm -rf $output_directory - if [[ $? != 0 ]]; then - echo Unable to remove '$output_directory'>&2 - return 1 - fi - fi - - echo "Creating directory: '$output_directory'" - mkdir -p $output_directory - - echo "Extracting archive" - tar -xf $zip_path -C $output_directory - if [[ $? != 0 ]]; then - echo "Unable to extract '$zip_path'" >&2 - return 1 - fi - - return 0 -} - -function GetCurrentOS { - local unameOut="$(uname -s)" - case $unameOut in - Linux*) echo "Linux";; - Darwin*) echo "MacOS";; - esac - return 0 -} - -function GetFile { - local uri=$1 - local path=$2 - local force=${3:-false} - local download_retries=${4:-5} - local retry_wait_time_seconds=${5:-30} - - if [[ -f $path ]]; then - if [[ $force = false ]]; then - echo "File '$path' already exists. Skipping download" - return 0 - else - rm -rf $path - fi - fi - - if [[ -f $uri ]]; then - echo "'$uri' is a file path, copying file to '$path'" - cp $uri $path - return $? - fi - - echo "Downloading $uri" - # Use curl if available, otherwise use wget - if command -v curl > /dev/null; then - curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail - else - wget -q -O "$path" "$uri" --tries="$download_retries" - fi - - return $? -} - -function GetTempPathFileName { - local path=$1 - - local temp_dir=$(GetTempDirectory) - local temp_file_name=$(basename $path) - echo $temp_dir$temp_file_name - return 0 -} - -function DownloadAndExtract { - local uri=$1 - local installDir=$2 - local force=${3:-false} - local download_retries=${4:-5} - local retry_wait_time_seconds=${5:-30} - - local temp_tool_path=$(GetTempPathFileName $uri) - - echo "downloading to: $temp_tool_path" - - # Download file - GetFile "$uri" "$temp_tool_path" $force $download_retries $retry_wait_time_seconds - if [[ $? != 0 ]]; then - echo "Failed to download '$uri' to '$temp_tool_path'." >&2 - return 1 - fi - - # Extract File - echo "extracting from $temp_tool_path to $installDir" - ExpandZip "$temp_tool_path" "$installDir" $force $download_retries $retry_wait_time_seconds - if [[ $? != 0 ]]; then - echo "Failed to extract '$temp_tool_path' to '$installDir'." >&2 - return 1 - fi - - return 0 -} - -function NewScriptShim { - local shimpath=$1 - local tool_file_path=$2 - local force=${3:-false} - - echo "Generating '$shimpath' shim" - if [[ -f $shimpath ]]; then - if [[ $force = false ]]; then - echo "File '$shimpath' already exists." >&2 - return 1 - else - rm -rf $shimpath - fi - fi - - if [[ ! -f $tool_file_path ]]; then - echo "Specified tool file path:'$tool_file_path' does not exist" >&2 - return 1 - fi - - local shim_contents=$'#!/usr/bin/env bash\n' - shim_contents+="SHIMARGS="$'$1\n' - shim_contents+="$tool_file_path"$' $SHIMARGS\n' - - # Write shim file - echo "$shim_contents" > $shimpath - - chmod +x $shimpath - - echo "Finished generating shim '$shimpath'" - - return $? -} - +#!/usr/bin/env bash + +function GetNativeInstallDirectory { + local install_dir + + if [[ -z $NETCOREENG_INSTALL_DIRECTORY ]]; then + install_dir=$HOME/.netcoreeng/native/ + else + install_dir=$NETCOREENG_INSTALL_DIRECTORY + fi + + echo $install_dir + return 0 +} + +function GetTempDirectory { + + echo $(GetNativeInstallDirectory)temp/ + return 0 +} + +function ExpandZip { + local zip_path=$1 + local output_directory=$2 + local force=${3:-false} + + echo "Extracting $zip_path to $output_directory" + if [[ -d $output_directory ]] && [[ $force = false ]]; then + echo "Directory '$output_directory' already exists, skipping extract" + return 0 + fi + + if [[ -d $output_directory ]]; then + echo "'Force flag enabled, but '$output_directory' exists. Removing directory" + rm -rf $output_directory + if [[ $? != 0 ]]; then + echo Unable to remove '$output_directory'>&2 + return 1 + fi + fi + + echo "Creating directory: '$output_directory'" + mkdir -p $output_directory + + echo "Extracting archive" + tar -xf $zip_path -C $output_directory + if [[ $? != 0 ]]; then + echo "Unable to extract '$zip_path'" >&2 + return 1 + fi + + return 0 +} + +function GetCurrentOS { + local unameOut="$(uname -s)" + case $unameOut in + Linux*) echo "Linux";; + Darwin*) echo "MacOS";; + esac + return 0 +} + +function GetFile { + local uri=$1 + local path=$2 + local force=${3:-false} + local download_retries=${4:-5} + local retry_wait_time_seconds=${5:-30} + + if [[ -f $path ]]; then + if [[ $force = false ]]; then + echo "File '$path' already exists. Skipping download" + return 0 + else + rm -rf $path + fi + fi + + if [[ -f $uri ]]; then + echo "'$uri' is a file path, copying file to '$path'" + cp $uri $path + return $? + fi + + echo "Downloading $uri" + # Use curl if available, otherwise use wget + if command -v curl > /dev/null; then + curl "$uri" -sSL --retry $download_retries --retry-delay $retry_wait_time_seconds --create-dirs -o "$path" --fail + else + wget -q -O "$path" "$uri" --tries="$download_retries" + fi + + return $? +} + +function GetTempPathFileName { + local path=$1 + + local temp_dir=$(GetTempDirectory) + local temp_file_name=$(basename $path) + echo $temp_dir$temp_file_name + return 0 +} + +function DownloadAndExtract { + local uri=$1 + local installDir=$2 + local force=${3:-false} + local download_retries=${4:-5} + local retry_wait_time_seconds=${5:-30} + + local temp_tool_path=$(GetTempPathFileName $uri) + + echo "downloading to: $temp_tool_path" + + # Download file + GetFile "$uri" "$temp_tool_path" $force $download_retries $retry_wait_time_seconds + if [[ $? != 0 ]]; then + echo "Failed to download '$uri' to '$temp_tool_path'." >&2 + return 1 + fi + + # Extract File + echo "extracting from $temp_tool_path to $installDir" + ExpandZip "$temp_tool_path" "$installDir" $force $download_retries $retry_wait_time_seconds + if [[ $? != 0 ]]; then + echo "Failed to extract '$temp_tool_path' to '$installDir'." >&2 + return 1 + fi + + return 0 +} + +function NewScriptShim { + local shimpath=$1 + local tool_file_path=$2 + local force=${3:-false} + + echo "Generating '$shimpath' shim" + if [[ -f $shimpath ]]; then + if [[ $force = false ]]; then + echo "File '$shimpath' already exists." >&2 + return 1 + else + rm -rf $shimpath + fi + fi + + if [[ ! -f $tool_file_path ]]; then + echo "Specified tool file path:'$tool_file_path' does not exist" >&2 + return 1 + fi + + local shim_contents=$'#!/usr/bin/env bash\n' + shim_contents+="SHIMARGS="$'$1\n' + shim_contents+="$tool_file_path"$' $SHIMARGS\n' + + # Write shim file + echo "$shim_contents" > $shimpath + + chmod +x $shimpath + + echo "Finished generating shim '$shimpath'" + + return $? +} + diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh index 7074f3b0f18..293af6017df 100644 --- a/eng/common/native/install-cmake.sh +++ b/eng/common/native/install-cmake.sh @@ -1,117 +1,117 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -. $scriptroot/common-library.sh - -base_uri= -install_path= -version= -clean=false -force=false -download_retries=5 -retry_wait_time_seconds=30 - -while (($# > 0)); do - lowerI="$(echo $1 | awk '{print tolower($0)}')" - case $lowerI in - --baseuri) - base_uri=$2 - shift 2 - ;; - --installpath) - install_path=$2 - shift 2 - ;; - --version) - version=$2 - shift 2 - ;; - --clean) - clean=true - shift 1 - ;; - --force) - force=true - shift 1 - ;; - --downloadretries) - download_retries=$2 - shift 2 - ;; - --retrywaittimeseconds) - retry_wait_time_seconds=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --baseuri Base file directory or Url wrom which to acquire tool archives" - echo " --installpath Base directory to install native tool to" - echo " --clean Don't install the tool, just clean up the current install of the tool" - echo " --force Force install of tools even if they previously exist" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --downloadretries Total number of retry attempts" - echo " --retrywaittimeseconds Wait time between retry attempts in seconds" - echo "" - exit 0 - ;; - esac -done - -tool_name="cmake" -tool_os=$(GetCurrentOS) -tool_folder=$(echo $tool_os | awk '{print tolower($0)}') -tool_arch="x86_64" -tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" -tool_install_directory="$install_path/$tool_name/$version" -tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" -shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/cmake/$tool_name_moniker.tar.gz" - -# Clean up tool and installers -if [[ $clean = true ]]; then - echo "Cleaning $tool_install_directory" - if [[ -d $tool_install_directory ]]; then - rm -rf $tool_install_directory - fi - - echo "Cleaning $shim_path" - if [[ -f $shim_path ]]; then - rm -rf $shim_path - fi - - tool_temp_path=$(GetTempPathFileName $uri) - echo "Cleaning $tool_temp_path" - if [[ -f $tool_temp_path ]]; then - rm -rf $tool_temp_path - fi - - exit 0 -fi - -# Install tool -if [[ -f $tool_file_path ]] && [[ $force = false ]]; then - echo "$tool_name ($version) already exists, skipping install" - exit 0 -fi - -DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds - -if [[ $? != 0 ]]; then - echo "Installation failed" >&2 - exit 1 -fi - -# Generate Shim -# Always rewrite shims so that we are referencing the expected version -NewScriptShim $shim_path $tool_file_path true - -if [[ $? != 0 ]]; then - echo "Shim generation failed" >&2 - exit 1 -fi - +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. $scriptroot/common-library.sh + +base_uri= +install_path= +version= +clean=false +force=false +download_retries=5 +retry_wait_time_seconds=30 + +while (($# > 0)); do + lowerI="$(echo $1 | awk '{print tolower($0)}')" + case $lowerI in + --baseuri) + base_uri=$2 + shift 2 + ;; + --installpath) + install_path=$2 + shift 2 + ;; + --version) + version=$2 + shift 2 + ;; + --clean) + clean=true + shift 1 + ;; + --force) + force=true + shift 1 + ;; + --downloadretries) + download_retries=$2 + shift 2 + ;; + --retrywaittimeseconds) + retry_wait_time_seconds=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --baseuri Base file directory or Url wrom which to acquire tool archives" + echo " --installpath Base directory to install native tool to" + echo " --clean Don't install the tool, just clean up the current install of the tool" + echo " --force Force install of tools even if they previously exist" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --downloadretries Total number of retry attempts" + echo " --retrywaittimeseconds Wait time between retry attempts in seconds" + echo "" + exit 0 + ;; + esac +done + +tool_name="cmake" +tool_os=$(GetCurrentOS) +tool_folder=$(echo $tool_os | awk '{print tolower($0)}') +tool_arch="x86_64" +tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" +tool_install_directory="$install_path/$tool_name/$version" +tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" +shim_path="$install_path/$tool_name.sh" +uri="${base_uri}/$tool_folder/cmake/$tool_name_moniker.tar.gz" + +# Clean up tool and installers +if [[ $clean = true ]]; then + echo "Cleaning $tool_install_directory" + if [[ -d $tool_install_directory ]]; then + rm -rf $tool_install_directory + fi + + echo "Cleaning $shim_path" + if [[ -f $shim_path ]]; then + rm -rf $shim_path + fi + + tool_temp_path=$(GetTempPathFileName $uri) + echo "Cleaning $tool_temp_path" + if [[ -f $tool_temp_path ]]; then + rm -rf $tool_temp_path + fi + + exit 0 +fi + +# Install tool +if [[ -f $tool_file_path ]] && [[ $force = false ]]; then + echo "$tool_name ($version) already exists, skipping install" + exit 0 +fi + +DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds + +if [[ $? != 0 ]]; then + echo "Installation failed" >&2 + exit 1 +fi + +# Generate Shim +# Always rewrite shims so that we are referencing the expected version +NewScriptShim $shim_path $tool_file_path true + +if [[ $? != 0 ]]; then + echo "Shim generation failed" >&2 + exit 1 +fi + exit 0 \ No newline at end of file diff --git a/eng/common/native/install-tool.ps1 b/eng/common/native/install-tool.ps1 index d295745f050..635ab3fd414 100644 --- a/eng/common/native/install-tool.ps1 +++ b/eng/common/native/install-tool.ps1 @@ -1,130 +1,130 @@ -<# -.SYNOPSIS -Install native tool - -.DESCRIPTION -Install cmake native tool from Azure blob storage - -.PARAMETER InstallPath -Base directory to install native tool to - -.PARAMETER BaseUri -Base file directory or Url from which to acquire tool archives - -.PARAMETER CommonLibraryDirectory -Path to folder containing common library modules - -.PARAMETER Force -Force install of tools even if they previously exist - -.PARAMETER Clean -Don't install the tool, just clean up the current install of the tool - -.PARAMETER DownloadRetries -Total number of retry attempts - -.PARAMETER RetryWaitTimeInSeconds -Wait time between retry attempts in seconds - -.NOTES -Returns 0 if install succeeds, 1 otherwise -#> -[CmdletBinding(PositionalBinding=$false)] -Param ( - [Parameter(Mandatory=$True)] - [string] $ToolName, - [Parameter(Mandatory=$True)] - [string] $InstallPath, - [Parameter(Mandatory=$True)] - [string] $BaseUri, - [Parameter(Mandatory=$True)] - [string] $Version, - [string] $CommonLibraryDirectory = $PSScriptRoot, - [switch] $Force = $False, - [switch] $Clean = $False, - [int] $DownloadRetries = 5, - [int] $RetryWaitTimeInSeconds = 30 -) - -# Import common library modules -Import-Module -Name (Join-Path $CommonLibraryDirectory "CommonLibrary.psm1") - -try { - # Define verbose switch if undefined - $Verbose = $VerbosePreference -Eq "Continue" - - $Arch = CommonLibrary\Get-MachineArchitecture - $ToolOs = "win64" - if($Arch -Eq "x32") { - $ToolOs = "win32" - } - $ToolNameMoniker = "$ToolName-$Version-$ToolOs-$Arch" - $ToolInstallDirectory = Join-Path $InstallPath "$ToolName\$Version\" - $Uri = "$BaseUri/windows/$ToolName/$ToolNameMoniker.zip" - $ShimPath = Join-Path $InstallPath "$ToolName.exe" - - if ($Clean) { - Write-Host "Cleaning $ToolInstallDirectory" - if (Test-Path $ToolInstallDirectory) { - Remove-Item $ToolInstallDirectory -Force -Recurse - } - Write-Host "Cleaning $ShimPath" - if (Test-Path $ShimPath) { - Remove-Item $ShimPath -Force - } - $ToolTempPath = CommonLibrary\Get-TempPathFilename -Path $Uri - Write-Host "Cleaning $ToolTempPath" - if (Test-Path $ToolTempPath) { - Remove-Item $ToolTempPath -Force - } - exit 0 - } - - # Install tool - if ((Test-Path $ToolInstallDirectory) -And (-Not $Force)) { - Write-Verbose "$ToolName ($Version) already exists, skipping install" - } - else { - $InstallStatus = CommonLibrary\DownloadAndExtract -Uri $Uri ` - -InstallDirectory $ToolInstallDirectory ` - -Force:$Force ` - -DownloadRetries $DownloadRetries ` - -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` - -Verbose:$Verbose - - if ($InstallStatus -Eq $False) { - Write-Error "Installation failed" - exit 1 - } - } - - $ToolFilePath = Get-ChildItem $ToolInstallDirectory -Recurse -Filter "$ToolName.exe" | % { $_.FullName } - if (@($ToolFilePath).Length -Gt 1) { - Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))" - exit 1 - } elseif (@($ToolFilePath).Length -Lt 1) { - Write-Error "$ToolName was not found in $ToolFilePath." - exit 1 - } - - # Generate shim - # Always rewrite shims so that we are referencing the expected version - $GenerateShimStatus = CommonLibrary\New-ScriptShim -ShimName $ToolName ` - -ShimDirectory $InstallPath ` - -ToolFilePath "$ToolFilePath" ` - -BaseUri $BaseUri ` - -Force:$Force ` - -Verbose:$Verbose - - if ($GenerateShimStatus -Eq $False) { - Write-Error "Generate shim failed" - return 1 - } - - exit 0 -} -catch { - Write-Host $_ - Write-Host $_.Exception - exit 1 -} +<# +.SYNOPSIS +Install native tool + +.DESCRIPTION +Install cmake native tool from Azure blob storage + +.PARAMETER InstallPath +Base directory to install native tool to + +.PARAMETER BaseUri +Base file directory or Url from which to acquire tool archives + +.PARAMETER CommonLibraryDirectory +Path to folder containing common library modules + +.PARAMETER Force +Force install of tools even if they previously exist + +.PARAMETER Clean +Don't install the tool, just clean up the current install of the tool + +.PARAMETER DownloadRetries +Total number of retry attempts + +.PARAMETER RetryWaitTimeInSeconds +Wait time between retry attempts in seconds + +.NOTES +Returns 0 if install succeeds, 1 otherwise +#> +[CmdletBinding(PositionalBinding=$false)] +Param ( + [Parameter(Mandatory=$True)] + [string] $ToolName, + [Parameter(Mandatory=$True)] + [string] $InstallPath, + [Parameter(Mandatory=$True)] + [string] $BaseUri, + [Parameter(Mandatory=$True)] + [string] $Version, + [string] $CommonLibraryDirectory = $PSScriptRoot, + [switch] $Force = $False, + [switch] $Clean = $False, + [int] $DownloadRetries = 5, + [int] $RetryWaitTimeInSeconds = 30 +) + +# Import common library modules +Import-Module -Name (Join-Path $CommonLibraryDirectory "CommonLibrary.psm1") + +try { + # Define verbose switch if undefined + $Verbose = $VerbosePreference -Eq "Continue" + + $Arch = CommonLibrary\Get-MachineArchitecture + $ToolOs = "win64" + if($Arch -Eq "x32") { + $ToolOs = "win32" + } + $ToolNameMoniker = "$ToolName-$Version-$ToolOs-$Arch" + $ToolInstallDirectory = Join-Path $InstallPath "$ToolName\$Version\" + $Uri = "$BaseUri/windows/$ToolName/$ToolNameMoniker.zip" + $ShimPath = Join-Path $InstallPath "$ToolName.exe" + + if ($Clean) { + Write-Host "Cleaning $ToolInstallDirectory" + if (Test-Path $ToolInstallDirectory) { + Remove-Item $ToolInstallDirectory -Force -Recurse + } + Write-Host "Cleaning $ShimPath" + if (Test-Path $ShimPath) { + Remove-Item $ShimPath -Force + } + $ToolTempPath = CommonLibrary\Get-TempPathFilename -Path $Uri + Write-Host "Cleaning $ToolTempPath" + if (Test-Path $ToolTempPath) { + Remove-Item $ToolTempPath -Force + } + exit 0 + } + + # Install tool + if ((Test-Path $ToolInstallDirectory) -And (-Not $Force)) { + Write-Verbose "$ToolName ($Version) already exists, skipping install" + } + else { + $InstallStatus = CommonLibrary\DownloadAndExtract -Uri $Uri ` + -InstallDirectory $ToolInstallDirectory ` + -Force:$Force ` + -DownloadRetries $DownloadRetries ` + -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` + -Verbose:$Verbose + + if ($InstallStatus -Eq $False) { + Write-Error "Installation failed" + exit 1 + } + } + + $ToolFilePath = Get-ChildItem $ToolInstallDirectory -Recurse -Filter "$ToolName.exe" | % { $_.FullName } + if (@($ToolFilePath).Length -Gt 1) { + Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))" + exit 1 + } elseif (@($ToolFilePath).Length -Lt 1) { + Write-Error "$ToolName was not found in $ToolFilePath." + exit 1 + } + + # Generate shim + # Always rewrite shims so that we are referencing the expected version + $GenerateShimStatus = CommonLibrary\New-ScriptShim -ShimName $ToolName ` + -ShimDirectory $InstallPath ` + -ToolFilePath "$ToolFilePath" ` + -BaseUri $BaseUri ` + -Force:$Force ` + -Verbose:$Verbose + + if ($GenerateShimStatus -Eq $False) { + Write-Error "Generate shim failed" + return 1 + } + + exit 0 +} +catch { + Write-Host $_ + Write-Host $_.Exception + exit 1 +} diff --git a/eng/common/pipeline-logging-functions.ps1 b/eng/common/pipeline-logging-functions.ps1 index 5d993591203..7b61376f8aa 100644 --- a/eng/common/pipeline-logging-functions.ps1 +++ b/eng/common/pipeline-logging-functions.ps1 @@ -1,233 +1,233 @@ -# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 and modified. - -# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 - -$script:loggingCommandPrefix = '##vso[' -$script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"? - New-Object psobject -Property @{ Token = ';' ; Replacement = '%3B' } - New-Object psobject -Property @{ Token = "`r" ; Replacement = '%0D' } - New-Object psobject -Property @{ Token = "`n" ; Replacement = '%0A' } - New-Object psobject -Property @{ Token = "]" ; Replacement = '%5D' } -) -# TODO: BUG: Escape % ??? -# TODO: Add test to verify don't need to escape "=". - -function Write-PipelineTelemetryError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Category, - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput) - - $PSBoundParameters.Remove("Category") | Out-Null - - $Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message" - $PSBoundParameters.Remove("Message") | Out-Null - $PSBoundParameters.Add("Message", $Message) - - Write-PipelineTaskError @PSBoundParameters -} - -function Write-PipelineTaskError { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Message, - [Parameter(Mandatory = $false)] - [string]$Type = 'error', - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput) - - if(!$ci) { - if($Type -eq 'error') { - Write-Host $Message -ForegroundColor Red - return - } - elseif ($Type -eq 'warning') { - Write-Host $Message -ForegroundColor Yellow - return - } - } - - if(($Type -ne 'error') -and ($Type -ne 'warning')) { - Write-Host $Message - return - } - if(-not $PSBoundParameters.ContainsKey('Type')) { - $PSBoundParameters.Add('Type', 'error') - } - Write-LogIssue @PSBoundParameters - } - - function Write-PipelineSetVariable { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Name, - [string]$Value, - [switch]$Secret, - [switch]$AsOutput) - - if($ci) { - Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ - 'variable' = $Name - 'isSecret' = $Secret - 'isOutput' = 'true' - } -AsOutput:$AsOutput - } - } - - function Write-PipelinePrependPath { - [CmdletBinding()] - param( - [Parameter(Mandatory=$true)] - [string]$Path, - [switch]$AsOutput) - if($ci) { - Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput - } - } - -<######################################## -# Private functions. -########################################> -function Format-LoggingCommandData { - [CmdletBinding()] - param([string]$Value, [switch]$Reverse) - - if (!$Value) { - return '' - } - - if (!$Reverse) { - foreach ($mapping in $script:loggingCommandEscapeMappings) { - $Value = $Value.Replace($mapping.Token, $mapping.Replacement) - } - } else { - for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) { - $mapping = $script:loggingCommandEscapeMappings[$i] - $Value = $Value.Replace($mapping.Replacement, $mapping.Token) - } - } - - return $Value -} - -function Format-LoggingCommand { - [CmdletBinding()] - param( - [Parameter(Mandatory = $true)] - [string]$Area, - [Parameter(Mandatory = $true)] - [string]$Event, - [string]$Data, - [hashtable]$Properties) - - # Append the preamble. - [System.Text.StringBuilder]$sb = New-Object -TypeName System.Text.StringBuilder - $null = $sb.Append($script:loggingCommandPrefix).Append($Area).Append('.').Append($Event) - - # Append the properties. - if ($Properties) { - $first = $true - foreach ($key in $Properties.Keys) { - [string]$value = Format-LoggingCommandData $Properties[$key] - if ($value) { - if ($first) { - $null = $sb.Append(' ') - $first = $false - } else { - $null = $sb.Append(';') - } - - $null = $sb.Append("$key=$value") - } - } - } - - # Append the tail and output the value. - $Data = Format-LoggingCommandData $Data - $sb.Append(']').Append($Data).ToString() -} - -function Write-LoggingCommand { - [CmdletBinding(DefaultParameterSetName = 'Parameters')] - param( - [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] - [string]$Area, - [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] - [string]$Event, - [Parameter(ParameterSetName = 'Parameters')] - [string]$Data, - [Parameter(ParameterSetName = 'Parameters')] - [hashtable]$Properties, - [Parameter(Mandatory = $true, ParameterSetName = 'Object')] - $Command, - [switch]$AsOutput) - - if ($PSCmdlet.ParameterSetName -eq 'Object') { - Write-LoggingCommand -Area $Command.Area -Event $Command.Event -Data $Command.Data -Properties $Command.Properties -AsOutput:$AsOutput - return - } - - $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties - if ($AsOutput) { - $command - } else { - Write-Host $command - } -} - -function Write-LogIssue { - [CmdletBinding()] - param( - [ValidateSet('warning', 'error')] - [Parameter(Mandatory = $true)] - [string]$Type, - [string]$Message, - [string]$ErrCode, - [string]$SourcePath, - [string]$LineNumber, - [string]$ColumnNumber, - [switch]$AsOutput) - - $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{ - 'type' = $Type - 'code' = $ErrCode - 'sourcepath' = $SourcePath - 'linenumber' = $LineNumber - 'columnnumber' = $ColumnNumber - } - if ($AsOutput) { - return $command - } - - if ($Type -eq 'error') { - $foregroundColor = $host.PrivateData.ErrorForegroundColor - $backgroundColor = $host.PrivateData.ErrorBackgroundColor - if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { - $foregroundColor = [System.ConsoleColor]::Red - $backgroundColor = [System.ConsoleColor]::Black - } - } else { - $foregroundColor = $host.PrivateData.WarningForegroundColor - $backgroundColor = $host.PrivateData.WarningBackgroundColor - if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { - $foregroundColor = [System.ConsoleColor]::Yellow - $backgroundColor = [System.ConsoleColor]::Black - } - } - - Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor +# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 and modified. + +# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1 + +$script:loggingCommandPrefix = '##vso[' +$script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"? + New-Object psobject -Property @{ Token = ';' ; Replacement = '%3B' } + New-Object psobject -Property @{ Token = "`r" ; Replacement = '%0D' } + New-Object psobject -Property @{ Token = "`n" ; Replacement = '%0A' } + New-Object psobject -Property @{ Token = "]" ; Replacement = '%5D' } +) +# TODO: BUG: Escape % ??? +# TODO: Add test to verify don't need to escape "=". + +function Write-PipelineTelemetryError { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Category, + [Parameter(Mandatory = $true)] + [string]$Message, + [Parameter(Mandatory = $false)] + [string]$Type = 'error', + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + $PSBoundParameters.Remove("Category") | Out-Null + + $Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message" + $PSBoundParameters.Remove("Message") | Out-Null + $PSBoundParameters.Add("Message", $Message) + + Write-PipelineTaskError @PSBoundParameters +} + +function Write-PipelineTaskError { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Message, + [Parameter(Mandatory = $false)] + [string]$Type = 'error', + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + if(!$ci) { + if($Type -eq 'error') { + Write-Host $Message -ForegroundColor Red + return + } + elseif ($Type -eq 'warning') { + Write-Host $Message -ForegroundColor Yellow + return + } + } + + if(($Type -ne 'error') -and ($Type -ne 'warning')) { + Write-Host $Message + return + } + if(-not $PSBoundParameters.ContainsKey('Type')) { + $PSBoundParameters.Add('Type', 'error') + } + Write-LogIssue @PSBoundParameters + } + + function Write-PipelineSetVariable { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Name, + [string]$Value, + [switch]$Secret, + [switch]$AsOutput) + + if($ci) { + Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ + 'variable' = $Name + 'isSecret' = $Secret + 'isOutput' = 'true' + } -AsOutput:$AsOutput + } + } + + function Write-PipelinePrependPath { + [CmdletBinding()] + param( + [Parameter(Mandatory=$true)] + [string]$Path, + [switch]$AsOutput) + if($ci) { + Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput + } + } + +<######################################## +# Private functions. +########################################> +function Format-LoggingCommandData { + [CmdletBinding()] + param([string]$Value, [switch]$Reverse) + + if (!$Value) { + return '' + } + + if (!$Reverse) { + foreach ($mapping in $script:loggingCommandEscapeMappings) { + $Value = $Value.Replace($mapping.Token, $mapping.Replacement) + } + } else { + for ($i = $script:loggingCommandEscapeMappings.Length - 1 ; $i -ge 0 ; $i--) { + $mapping = $script:loggingCommandEscapeMappings[$i] + $Value = $Value.Replace($mapping.Replacement, $mapping.Token) + } + } + + return $Value +} + +function Format-LoggingCommand { + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [string]$Area, + [Parameter(Mandatory = $true)] + [string]$Event, + [string]$Data, + [hashtable]$Properties) + + # Append the preamble. + [System.Text.StringBuilder]$sb = New-Object -TypeName System.Text.StringBuilder + $null = $sb.Append($script:loggingCommandPrefix).Append($Area).Append('.').Append($Event) + + # Append the properties. + if ($Properties) { + $first = $true + foreach ($key in $Properties.Keys) { + [string]$value = Format-LoggingCommandData $Properties[$key] + if ($value) { + if ($first) { + $null = $sb.Append(' ') + $first = $false + } else { + $null = $sb.Append(';') + } + + $null = $sb.Append("$key=$value") + } + } + } + + # Append the tail and output the value. + $Data = Format-LoggingCommandData $Data + $sb.Append(']').Append($Data).ToString() +} + +function Write-LoggingCommand { + [CmdletBinding(DefaultParameterSetName = 'Parameters')] + param( + [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] + [string]$Area, + [Parameter(Mandatory = $true, ParameterSetName = 'Parameters')] + [string]$Event, + [Parameter(ParameterSetName = 'Parameters')] + [string]$Data, + [Parameter(ParameterSetName = 'Parameters')] + [hashtable]$Properties, + [Parameter(Mandatory = $true, ParameterSetName = 'Object')] + $Command, + [switch]$AsOutput) + + if ($PSCmdlet.ParameterSetName -eq 'Object') { + Write-LoggingCommand -Area $Command.Area -Event $Command.Event -Data $Command.Data -Properties $Command.Properties -AsOutput:$AsOutput + return + } + + $command = Format-LoggingCommand -Area $Area -Event $Event -Data $Data -Properties $Properties + if ($AsOutput) { + $command + } else { + Write-Host $command + } +} + +function Write-LogIssue { + [CmdletBinding()] + param( + [ValidateSet('warning', 'error')] + [Parameter(Mandatory = $true)] + [string]$Type, + [string]$Message, + [string]$ErrCode, + [string]$SourcePath, + [string]$LineNumber, + [string]$ColumnNumber, + [switch]$AsOutput) + + $command = Format-LoggingCommand -Area 'task' -Event 'logissue' -Data $Message -Properties @{ + 'type' = $Type + 'code' = $ErrCode + 'sourcepath' = $SourcePath + 'linenumber' = $LineNumber + 'columnnumber' = $ColumnNumber + } + if ($AsOutput) { + return $command + } + + if ($Type -eq 'error') { + $foregroundColor = $host.PrivateData.ErrorForegroundColor + $backgroundColor = $host.PrivateData.ErrorBackgroundColor + if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { + $foregroundColor = [System.ConsoleColor]::Red + $backgroundColor = [System.ConsoleColor]::Black + } + } else { + $foregroundColor = $host.PrivateData.WarningForegroundColor + $backgroundColor = $host.PrivateData.WarningBackgroundColor + if ($foregroundColor -isnot [System.ConsoleColor] -or $backgroundColor -isnot [System.ConsoleColor]) { + $foregroundColor = [System.ConsoleColor]::Yellow + $backgroundColor = [System.ConsoleColor]::Black + } + } + + Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor } \ No newline at end of file diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh index 7868684076b..6098f9a5438 100644 --- a/eng/common/pipeline-logging-functions.sh +++ b/eng/common/pipeline-logging-functions.sh @@ -1,102 +1,102 @@ -#!/usr/bin/env bash - -function Write-PipelineTelemetryError { - local telemetry_category='' - local function_args=() - local message='' - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" - case "$opt" in - -category|-c) - telemetry_category=$2 - shift - ;; - -*) - function_args+=("$1 $2") - shift - ;; - *) - message=$* - ;; - esac - shift - done - - if [[ "$ci" != true ]]; then - echo "$message" >&2 - return - fi - - message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message" - function_args+=("$message") - - Write-PipelineTaskError $function_args -} - -function Write-PipelineTaskError { - if [[ "$ci" != true ]]; then - echo "$@" >&2 - return - fi - - message_type="error" - sourcepath='' - linenumber='' - columnnumber='' - error_code='' - - while [[ $# -gt 0 ]]; do - opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" - case "$opt" in - -type|-t) - message_type=$2 - shift - ;; - -sourcepath|-s) - sourcepath=$2 - shift - ;; - -linenumber|-ln) - linenumber=$2 - shift - ;; - -columnnumber|-cn) - columnnumber=$2 - shift - ;; - -errcode|-e) - error_code=$2 - shift - ;; - *) - break - ;; - esac - - shift - done - - message="##vso[task.logissue" - - message="$message type=$message_type" - - if [ -n "$sourcepath" ]; then - message="$message;sourcepath=$sourcepath" - fi - - if [ -n "$linenumber" ]; then - message="$message;linenumber=$linenumber" - fi - - if [ -n "$columnnumber" ]; then - message="$message;columnnumber=$columnnumber" - fi - - if [ -n "$error_code" ]; then - message="$message;code=$error_code" - fi - - message="$message]$*" - echo "$message" -} - +#!/usr/bin/env bash + +function Write-PipelineTelemetryError { + local telemetry_category='' + local function_args=() + local message='' + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -category|-c) + telemetry_category=$2 + shift + ;; + -*) + function_args+=("$1 $2") + shift + ;; + *) + message=$* + ;; + esac + shift + done + + if [[ "$ci" != true ]]; then + echo "$message" >&2 + return + fi + + message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message" + function_args+=("$message") + + Write-PipelineTaskError $function_args +} + +function Write-PipelineTaskError { + if [[ "$ci" != true ]]; then + echo "$@" >&2 + return + fi + + message_type="error" + sourcepath='' + linenumber='' + columnnumber='' + error_code='' + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -type|-t) + message_type=$2 + shift + ;; + -sourcepath|-s) + sourcepath=$2 + shift + ;; + -linenumber|-ln) + linenumber=$2 + shift + ;; + -columnnumber|-cn) + columnnumber=$2 + shift + ;; + -errcode|-e) + error_code=$2 + shift + ;; + *) + break + ;; + esac + + shift + done + + message="##vso[task.logissue" + + message="$message type=$message_type" + + if [ -n "$sourcepath" ]; then + message="$message;sourcepath=$sourcepath" + fi + + if [ -n "$linenumber" ]; then + message="$message;linenumber=$linenumber" + fi + + if [ -n "$columnnumber" ]; then + message="$message;columnnumber=$columnnumber" + fi + + if [ -n "$error_code" ]; then + message="$message;code=$error_code" + fi + + message="$message]$*" + echo "$message" +} + diff --git a/eng/common/post-build/dotnetsymbol-init.ps1 b/eng/common/post-build/dotnetsymbol-init.ps1 index a4e511732a4..e7659b98c8c 100644 --- a/eng/common/post-build/dotnetsymbol-init.ps1 +++ b/eng/common/post-build/dotnetsymbol-init.ps1 @@ -1,29 +1,29 @@ -param ( - $dotnetsymbolVersion = $null -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 - -$verbosity = "minimal" - -function Installdotnetsymbol ($dotnetsymbolVersion) { - $dotnetsymbolPackageName = "dotnet-symbol" - - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - $toolList = & "$dotnet" tool list --global - - if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) { - Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed." - } - else { - Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..." - Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity $verbosity --global - } -} - -Installdotnetsymbol $dotnetsymbolVersion +param ( + $dotnetsymbolVersion = $null +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +$verbosity = "minimal" + +function Installdotnetsymbol ($dotnetsymbolVersion) { + $dotnetsymbolPackageName = "dotnet-symbol" + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list --global + + if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) { + Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed." + } + else { + Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..." + Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." + & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity $verbosity --global + } +} + +Installdotnetsymbol $dotnetsymbolVersion diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 new file mode 100644 index 00000000000..1bdced1e307 --- /dev/null +++ b/eng/common/post-build/nuget-validation.ps1 @@ -0,0 +1,28 @@ +# This script validates NuGet package metadata information using this +# tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage + +param( + [Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are + [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +try { + $url = "https://raw.githubusercontent.com/NuGet/NuGetGallery/jver-verify/src/VerifyMicrosoftPackage/verify.ps1" + + New-Item -ItemType "directory" -Path ${ToolDestinationPath} -Force + + Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 + + & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg +} +catch { + Write-PipelineTaskError "NuGet package validation failed. Please check error logs." + Write-Host $_ + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/post-build/promote-build.ps1 b/eng/common/post-build/promote-build.ps1 new file mode 100644 index 00000000000..84a608fa569 --- /dev/null +++ b/eng/common/post-build/promote-build.ps1 @@ -0,0 +1,53 @@ +param( + [Parameter(Mandatory=$true)][int] $BuildId, + [Parameter(Mandatory=$true)][int] $ChannelId, + [Parameter(Mandatory=$true)][string] $BarToken, + [string] $MaestroEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com", + [string] $ApiVersion = "2019-01-16" +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +function Get-Headers([string]$accept, [string]$barToken) { + $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $headers.Add('Accept',$accept) + $headers.Add('Authorization',"Bearer $barToken") + return $headers +} + +try { + $maestroHeaders = Get-Headers 'application/json' $BarToken + + # Get info about which channels the build has already been promoted to + $getBuildApiEndpoint = "$MaestroEndpoint/api/builds/${BuildId}?api-version=$ApiVersion" + $buildInfo = Invoke-WebRequest -Method Get -Uri $getBuildApiEndpoint -Headers $maestroHeaders | ConvertFrom-Json + + if (!$buildInfo) { + Write-Host "Build with BAR ID $BuildId was not found in BAR!" + ExitWithExitCode 1 + } + + # Find whether the build is already assigned to the channel or not + if ($buildInfo.channels) { + foreach ($channel in $buildInfo.channels) { + if ($channel.Id -eq $ChannelId) { + Write-Host "The build with BAR ID $BuildId is already on channel $ChannelId!" + ExitWithExitCode 0 + } + } + } + + Write-Host "Build not present in channel $ChannelId. Promoting build ... " + + $promoteBuildApiEndpoint = "$maestroEndpoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$ApiVersion" + Invoke-WebRequest -Method Post -Uri $promoteBuildApiEndpoint -Headers $maestroHeaders + Write-Host "done." +} +catch { + Write-Host "There was an error while trying to promote build '$BuildId' to channel '$ChannelId'" + Write-Host $_ + Write-Host $_.ScriptStackTrace +} diff --git a/eng/common/post-build/sourcelink-cli-init.ps1 b/eng/common/post-build/sourcelink-cli-init.ps1 index 723dd073f1f..9eaa25b3b50 100644 --- a/eng/common/post-build/sourcelink-cli-init.ps1 +++ b/eng/common/post-build/sourcelink-cli-init.ps1 @@ -1,29 +1,29 @@ -param ( - $sourcelinkCliVersion = $null -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 - -$verbosity = "minimal" - -function InstallSourcelinkCli ($sourcelinkCliVersion) { - $sourcelinkCliPackageName = "sourcelink" - - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - $toolList = & "$dotnet" tool list --global - - if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) { - Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed." - } - else { - Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..." - Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity $verbosity --global - } -} - -InstallSourcelinkCli $sourcelinkCliVersion +param ( + $sourcelinkCliVersion = $null +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +$verbosity = "minimal" + +function InstallSourcelinkCli ($sourcelinkCliVersion) { + $sourcelinkCliPackageName = "sourcelink" + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list --global + + if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) { + Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed." + } + else { + Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..." + Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." + & "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity $verbosity --global + } +} + +InstallSourcelinkCli $sourcelinkCliVersion diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 5e9a9404b08..8abd684e9e5 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -1,224 +1,224 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where Symbols.NuGet packages to be checked are stored - [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade - [Parameter(Mandatory=$true)][string] $GHCommit, # GitHub commit SHA used to build the packages - [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 - -# Cache/HashMap (File -> Exist flag) used to consult whether a file exist -# in the repository at a specific commit point. This is populated by inserting -# all files present in the repo at a specific commit point. -$global:RepoFiles = @{} - -$ValidatePackage = { - param( - [string] $PackagePath # Full path to a Symbols.NuGet package - ) - - . $using:PSScriptRoot\..\tools.ps1 - - # Ensure input file exist - if (!(Test-Path $PackagePath)) { - Write-PipelineTaskError "Input file does not exist: $PackagePath" - ExitWithExitCode 1 - } - - # Extensions for which we'll look for SourceLink information - # For now we'll only care about Portable & Embedded PDBs - $RelevantExtensions = @(".dll", ".exe", ".pdb") - - Write-Host -NoNewLine "Validating" ([System.IO.Path]::GetFileName($PackagePath)) "... " - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId - $FailedFiles = 0 - - Add-Type -AssemblyName System.IO.Compression.FileSystem - - [System.IO.Directory]::CreateDirectory($ExtractPath); - - try { - $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) - - $zip.Entries | - Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | - ForEach-Object { - $FileName = $_.FullName - $Extension = [System.IO.Path]::GetExtension($_.Name) - $FakeName = -Join((New-Guid), $Extension) - $TargetFile = Join-Path -Path $ExtractPath -ChildPath $FakeName - - # We ignore resource DLLs - if ($FileName.EndsWith(".resources.dll")) { - return - } - - [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) - - $ValidateFile = { - param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $RealPath, - [ref] $FailedFiles - ) - - $sourcelinkExe = "$env:USERPROFILE\.dotnet\tools" - $sourcelinkExe = Resolve-Path "$sourcelinkExe\sourcelink.exe" - $SourceLinkInfos = & $sourcelinkExe print-urls $FullPath | Out-String - - if ($LASTEXITCODE -eq 0 -and -not ([string]::IsNullOrEmpty($SourceLinkInfos))) { - $NumFailedLinks = 0 - - # We only care about Http addresses - $Matches = (Select-String '(http[s]?)(:\/\/)([^\s,]+)' -Input $SourceLinkInfos -AllMatches).Matches - - if ($Matches.Count -ne 0) { - $Matches.Value | - ForEach-Object { - $Link = $_ - $CommitUrl = "https://raw.githubusercontent.com/${using:GHRepoName}/${using:GHCommit}/" - - $FilePath = $Link.Replace($CommitUrl, "") - $Status = 200 - $Cache = $using:RepoFiles - - if ( !($Cache.ContainsKey($FilePath)) ) { - try { - $Uri = $Link -as [System.URI] - - # Only GitHub links are valid - if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match "github" -or $Uri.Host -match "githubusercontent")) { - $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode - } - else { - $Status = 0 - } - } - catch { - write-host $_ - $Status = 0 - } - } - - if ($Status -ne 200) { - if ($NumFailedLinks -eq 0) { - if ($FailedFiles.Value -eq 0) { - Write-Host - } - - Write-Host "`tFile $RealPath has broken links:" - } - - Write-Host "`t`tFailed to retrieve $Link" - - $NumFailedLinks++ - } - } - } - - if ($NumFailedLinks -ne 0) { - $FailedFiles.value++ - $global:LASTEXITCODE = 1 - } - } - } - - &$ValidateFile $TargetFile $FileName ([ref]$FailedFiles) - } - } - catch { - - } - finally { - $zip.Dispose() - } - - if ($FailedFiles -eq 0) { - Write-Host "Passed." - } - else { - Write-PipelineTaskError "$PackagePath has broken SourceLink links." - } -} - -function ValidateSourceLinkLinks { - if (!($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { - if (!($GHRepoName -Match "^[^\s-]+-[^\s]+$")) { - Write-PipelineTaskError "GHRepoName should be in the format / or -" - ExitWithExitCode 1 - } - else { - $GHRepoName = $GHRepoName -replace '^([^\s-]+)-([^\s]+)$', '$1/$2'; - } - } - - if (!($GHCommit -Match "^[0-9a-fA-F]{40}$")) { - Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string" - ExitWithExitCode 1 - } - - $RepoTreeURL = -Join("http://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1") - $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript") - - try { - # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash - $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree - - foreach ($file in $Data) { - $Extension = [System.IO.Path]::GetExtension($file.path) - - if ($CodeExtensions.Contains($Extension)) { - $RepoFiles[$file.path] = 1 - } - } - } - catch { - Write-PipelineTaskError "Problems downloading the list of files from the repo. Url used: $RepoTreeURL" - Write-Host $_ - ExitWithExitCode 1 - } - - if (Test-Path $ExtractPath) { - Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue - } - - # Process each NuGet package in parallel - $Jobs = @() - Get-ChildItem "$InputPath\*.symbols.nupkg" | - ForEach-Object { - $Jobs += Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName - } - - foreach ($Job in $Jobs) { - Wait-Job -Id $Job.Id | Receive-Job - } -} - -function CheckExitCode ([string]$stage) { - $exitCode = $LASTEXITCODE - if ($exitCode -ne 0) { - Write-PipelineTaskError "Something failed while '$stage'. Check for errors above. Exiting now..." - ExitWithExitCode $exitCode - } -} - -try { - Write-Host "Installing SourceLink CLI..." - Get-Location - . $PSScriptRoot\sourcelink-cli-init.ps1 -sourcelinkCliVersion $SourcelinkCliVersion - CheckExitCode "Running sourcelink-cli-init" - - Measure-Command { ValidateSourceLinkLinks } -} -catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - ExitWithExitCode 1 -} +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where Symbols.NuGet packages to be checked are stored + [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory=$true)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade + [Parameter(Mandatory=$true)][string] $GHCommit, # GitHub commit SHA used to build the packages + [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +# Cache/HashMap (File -> Exist flag) used to consult whether a file exist +# in the repository at a specific commit point. This is populated by inserting +# all files present in the repo at a specific commit point. +$global:RepoFiles = @{} + +$ValidatePackage = { + param( + [string] $PackagePath # Full path to a Symbols.NuGet package + ) + + . $using:PSScriptRoot\..\tools.ps1 + + # Ensure input file exist + if (!(Test-Path $PackagePath)) { + Write-PipelineTaskError "Input file does not exist: $PackagePath" + ExitWithExitCode 1 + } + + # Extensions for which we'll look for SourceLink information + # For now we'll only care about Portable & Embedded PDBs + $RelevantExtensions = @(".dll", ".exe", ".pdb") + + Write-Host -NoNewLine "Validating" ([System.IO.Path]::GetFileName($PackagePath)) "... " + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId + $FailedFiles = 0 + + Add-Type -AssemblyName System.IO.Compression.FileSystem + + [System.IO.Directory]::CreateDirectory($ExtractPath); + + try { + $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) + + $zip.Entries | + Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | + ForEach-Object { + $FileName = $_.FullName + $Extension = [System.IO.Path]::GetExtension($_.Name) + $FakeName = -Join((New-Guid), $Extension) + $TargetFile = Join-Path -Path $ExtractPath -ChildPath $FakeName + + # We ignore resource DLLs + if ($FileName.EndsWith(".resources.dll")) { + return + } + + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) + + $ValidateFile = { + param( + [string] $FullPath, # Full path to the module that has to be checked + [string] $RealPath, + [ref] $FailedFiles + ) + + $sourcelinkExe = "$env:USERPROFILE\.dotnet\tools" + $sourcelinkExe = Resolve-Path "$sourcelinkExe\sourcelink.exe" + $SourceLinkInfos = & $sourcelinkExe print-urls $FullPath | Out-String + + if ($LASTEXITCODE -eq 0 -and -not ([string]::IsNullOrEmpty($SourceLinkInfos))) { + $NumFailedLinks = 0 + + # We only care about Http addresses + $Matches = (Select-String '(http[s]?)(:\/\/)([^\s,]+)' -Input $SourceLinkInfos -AllMatches).Matches + + if ($Matches.Count -ne 0) { + $Matches.Value | + ForEach-Object { + $Link = $_ + $CommitUrl = "https://raw.githubusercontent.com/${using:GHRepoName}/${using:GHCommit}/" + + $FilePath = $Link.Replace($CommitUrl, "") + $Status = 200 + $Cache = $using:RepoFiles + + if ( !($Cache.ContainsKey($FilePath)) ) { + try { + $Uri = $Link -as [System.URI] + + # Only GitHub links are valid + if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match "github" -or $Uri.Host -match "githubusercontent")) { + $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode + } + else { + $Status = 0 + } + } + catch { + write-host $_ + $Status = 0 + } + } + + if ($Status -ne 200) { + if ($NumFailedLinks -eq 0) { + if ($FailedFiles.Value -eq 0) { + Write-Host + } + + Write-Host "`tFile $RealPath has broken links:" + } + + Write-Host "`t`tFailed to retrieve $Link" + + $NumFailedLinks++ + } + } + } + + if ($NumFailedLinks -ne 0) { + $FailedFiles.value++ + $global:LASTEXITCODE = 1 + } + } + } + + &$ValidateFile $TargetFile $FileName ([ref]$FailedFiles) + } + } + catch { + + } + finally { + $zip.Dispose() + } + + if ($FailedFiles -eq 0) { + Write-Host "Passed." + } + else { + Write-PipelineTaskError "$PackagePath has broken SourceLink links." + } +} + +function ValidateSourceLinkLinks { + if (!($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { + if (!($GHRepoName -Match "^[^\s-]+-[^\s]+$")) { + Write-PipelineTaskError "GHRepoName should be in the format / or -" + ExitWithExitCode 1 + } + else { + $GHRepoName = $GHRepoName -replace '^([^\s-]+)-([^\s]+)$', '$1/$2'; + } + } + + if (!($GHCommit -Match "^[0-9a-fA-F]{40}$")) { + Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string" + ExitWithExitCode 1 + } + + $RepoTreeURL = -Join("http://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1") + $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript") + + try { + # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash + $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree + + foreach ($file in $Data) { + $Extension = [System.IO.Path]::GetExtension($file.path) + + if ($CodeExtensions.Contains($Extension)) { + $RepoFiles[$file.path] = 1 + } + } + } + catch { + Write-PipelineTaskError "Problems downloading the list of files from the repo. Url used: $RepoTreeURL" + Write-Host $_ + ExitWithExitCode 1 + } + + if (Test-Path $ExtractPath) { + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue + } + + # Process each NuGet package in parallel + $Jobs = @() + Get-ChildItem "$InputPath\*.symbols.nupkg" | + ForEach-Object { + $Jobs += Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName + } + + foreach ($Job in $Jobs) { + Wait-Job -Id $Job.Id | Receive-Job + } +} + +function CheckExitCode ([string]$stage) { + $exitCode = $LASTEXITCODE + if ($exitCode -ne 0) { + Write-PipelineTaskError "Something failed while '$stage'. Check for errors above. Exiting now..." + ExitWithExitCode $exitCode + } +} + +try { + Write-Host "Installing SourceLink CLI..." + Get-Location + . $PSScriptRoot\sourcelink-cli-init.ps1 -sourcelinkCliVersion $SourcelinkCliVersion + CheckExitCode "Running sourcelink-cli-init" + + Measure-Command { ValidateSourceLinkLinks } +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 663ca636363..69456854e04 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -1,186 +1,186 @@ -param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored - [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion # Version of dotnet symbol to use -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 - -Add-Type -AssemblyName System.IO.Compression.FileSystem - -function FirstMatchingSymbolDescriptionOrDefault { - param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols - [string] $SymbolsPath - ) - - $FileName = [System.IO.Path]::GetFileName($FullPath) - $Extension = [System.IO.Path]::GetExtension($FullPath) - - # Those below are potential symbol files that the `dotnet symbol` might - # return. Which one will be returned depend on the type of file we are - # checking and which type of file was uploaded. - - # The file itself is returned - $SymbolPath = $SymbolsPath + "\" + $FileName - - # PDB file for the module - $PdbPath = $SymbolPath.Replace($Extension, ".pdb") - - # PDB file for R2R module (created by crossgen) - $NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb") - - # DBG file for a .so library - $SODbg = $SymbolPath.Replace($Extension, ".so.dbg") - - # DWARF file for a .dylib - $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") - - $dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools" - $dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe" - - & $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null - - if (Test-Path $PdbPath) { - return "PDB" - } - elseif (Test-Path $NGenPdb) { - return "NGen PDB" - } - elseif (Test-Path $SODbg) { - return "DBG for SO" - } - elseif (Test-Path $DylibDwarf) { - return "Dwarf for Dylib" - } - elseif (Test-Path $SymbolPath) { - return "Module" - } - else { - return $null - } -} - -function CountMissingSymbols { - param( - [string] $PackagePath # Path to a NuGet package - ) - - # Ensure input file exist - if (!(Test-Path $PackagePath)) { - Write-PipelineTaskError "Input file does not exist: $PackagePath" - ExitWithExitCode 1 - } - - # Extensions for which we'll look for symbols - $RelevantExtensions = @(".dll", ".exe", ".so", ".dylib") - - # How many files are missing symbol information - $MissingSymbols = 0 - - $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) - $PackageGuid = New-Guid - $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid - $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols" - - [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath) - - Get-ChildItem -Recurse $ExtractPath | - Where-Object {$RelevantExtensions -contains $_.Extension} | - ForEach-Object { - if ($_.FullName -Match "\\ref\\") { - Write-Host "`t Ignoring reference assembly file" $_.FullName - return - } - - $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath - $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath - - Write-Host -NoNewLine "`t Checking file" $_.FullName "... " - - if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { - Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")" - } - else { - $MissingSymbols++ - - if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { - Write-Host "No symbols found on MSDL or SymWeb!" - } - else { - if ($SymbolsOnMSDL -eq $null) { - Write-Host "No symbols found on MSDL!" - } - else { - Write-Host "No symbols found on SymWeb!" - } - } - } - } - - Pop-Location - - return $MissingSymbols -} - -function CheckSymbolsAvailable { - if (Test-Path $ExtractPath) { - Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue - } - - Get-ChildItem "$InputPath\*.nupkg" | - ForEach-Object { - $FileName = $_.Name - - # These packages from Arcade-Services include some native libraries that - # our current symbol uploader can't handle. Below is a workaround until - # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted. - if ($FileName -Match "Microsoft\.DotNet\.Darc\.") { - Write-Host "Ignoring Arcade-services file: $FileName" - Write-Host - return - } - elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") { - Write-Host "Ignoring Arcade-services file: $FileName" - Write-Host - return - } - - Write-Host "Validating $FileName " - $Status = CountMissingSymbols "$InputPath\$FileName" - - if ($Status -ne 0) { - Write-PipelineTaskError "Missing symbols for $Status modules in the package $FileName" - ExitWithExitCode $exitCode - } - - Write-Host - } -} - -function CheckExitCode ([string]$stage) { - $exitCode = $LASTEXITCODE - if ($exitCode -ne 0) { - Write-PipelineTaskError "Something failed while '$stage'. Check for errors above. Exiting now..." - ExitWithExitCode $exitCode - } -} - -try { - Write-Host "Installing dotnet symbol ..." - Get-Location - . $PSScriptRoot\dotnetsymbol-init.ps1 -dotnetsymbolVersion $DotnetSymbolVersion - CheckExitCode "Running dotnetsymbol-init" - - CheckSymbolsAvailable -} -catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - ExitWithExitCode 1 -} +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored + [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion # Version of dotnet symbol to use +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +Add-Type -AssemblyName System.IO.Compression.FileSystem + +function FirstMatchingSymbolDescriptionOrDefault { + param( + [string] $FullPath, # Full path to the module that has to be checked + [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $SymbolsPath + ) + + $FileName = [System.IO.Path]::GetFileName($FullPath) + $Extension = [System.IO.Path]::GetExtension($FullPath) + + # Those below are potential symbol files that the `dotnet symbol` might + # return. Which one will be returned depend on the type of file we are + # checking and which type of file was uploaded. + + # The file itself is returned + $SymbolPath = $SymbolsPath + "\" + $FileName + + # PDB file for the module + $PdbPath = $SymbolPath.Replace($Extension, ".pdb") + + # PDB file for R2R module (created by crossgen) + $NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb") + + # DBG file for a .so library + $SODbg = $SymbolPath.Replace($Extension, ".so.dbg") + + # DWARF file for a .dylib + $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") + + $dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools" + $dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe" + + & $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null + + if (Test-Path $PdbPath) { + return "PDB" + } + elseif (Test-Path $NGenPdb) { + return "NGen PDB" + } + elseif (Test-Path $SODbg) { + return "DBG for SO" + } + elseif (Test-Path $DylibDwarf) { + return "Dwarf for Dylib" + } + elseif (Test-Path $SymbolPath) { + return "Module" + } + else { + return $null + } +} + +function CountMissingSymbols { + param( + [string] $PackagePath # Path to a NuGet package + ) + + # Ensure input file exist + if (!(Test-Path $PackagePath)) { + Write-PipelineTaskError "Input file does not exist: $PackagePath" + ExitWithExitCode 1 + } + + # Extensions for which we'll look for symbols + $RelevantExtensions = @(".dll", ".exe", ".so", ".dylib") + + # How many files are missing symbol information + $MissingSymbols = 0 + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $PackageGuid = New-Guid + $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid + $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols" + + [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath) + + Get-ChildItem -Recurse $ExtractPath | + Where-Object {$RelevantExtensions -contains $_.Extension} | + ForEach-Object { + if ($_.FullName -Match "\\ref\\") { + Write-Host "`t Ignoring reference assembly file" $_.FullName + return + } + + $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath + $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath + + Write-Host -NoNewLine "`t Checking file" $_.FullName "... " + + if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { + Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")" + } + else { + $MissingSymbols++ + + if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { + Write-Host "No symbols found on MSDL or SymWeb!" + } + else { + if ($SymbolsOnMSDL -eq $null) { + Write-Host "No symbols found on MSDL!" + } + else { + Write-Host "No symbols found on SymWeb!" + } + } + } + } + + Pop-Location + + return $MissingSymbols +} + +function CheckSymbolsAvailable { + if (Test-Path $ExtractPath) { + Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue + } + + Get-ChildItem "$InputPath\*.nupkg" | + ForEach-Object { + $FileName = $_.Name + + # These packages from Arcade-Services include some native libraries that + # our current symbol uploader can't handle. Below is a workaround until + # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted. + if ($FileName -Match "Microsoft\.DotNet\.Darc\.") { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") { + Write-Host "Ignoring Arcade-services file: $FileName" + Write-Host + return + } + + Write-Host "Validating $FileName " + $Status = CountMissingSymbols "$InputPath\$FileName" + + if ($Status -ne 0) { + Write-PipelineTaskError "Missing symbols for $Status modules in the package $FileName" + ExitWithExitCode $exitCode + } + + Write-Host + } +} + +function CheckExitCode ([string]$stage) { + $exitCode = $LASTEXITCODE + if ($exitCode -ne 0) { + Write-PipelineTaskError "Something failed while '$stage'. Check for errors above. Exiting now..." + ExitWithExitCode $exitCode + } +} + +try { + Write-Host "Installing dotnet symbol ..." + Get-Location + . $PSScriptRoot\dotnetsymbol-init.ps1 -dotnetsymbolVersion $DotnetSymbolVersion + CheckExitCode "Running dotnetsymbol-init" + + CheckSymbolsAvailable +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 new file mode 100644 index 00000000000..db8a839457a --- /dev/null +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -0,0 +1,69 @@ +param( + [Parameter(Mandatory=$true)][string] $SourceRepo, + [Parameter(Mandatory=$true)][int] $ChannelId, + [string] $MaestroEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com", + [string] $BarToken, + [string] $ApiVersion = "2019-01-16" +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +function Get-Headers([string]$accept, [string]$barToken) { + $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $headers.Add('Accept',$accept) + $headers.Add('Authorization',"Bearer $barToken") + return $headers +} + +# Get all the $SourceRepo subscriptions +$normalizedSurceRepo = $SourceRepo.Replace('dnceng@', '') +$getSubscriptionsApiEndpoint = "$maestroEndpoint/api/subscriptions?sourceRepository=$normalizedSurceRepo&api-version=$apiVersion" +$headers = Get-Headers 'application/json' $barToken + +$subscriptions = Invoke-WebRequest -Uri $getSubscriptionsApiEndpoint -Headers $headers | ConvertFrom-Json + +if (!$subscriptions) { + Write-Host "No subscriptions found for source repo '$normalizedSurceRepo' in channel '$ChannelId'" + return +} + +$subscriptionsToTrigger = New-Object System.Collections.Generic.List[string] +$failedTriggeredSubscription = $false + +# Get all enabled subscriptions that need dependency flow on 'everyBuild' +foreach ($subscription in $subscriptions) { + if ($subscription.enabled -and $subscription.policy.updateFrequency -like 'everyBuild' -and $subscription.channel.id -eq $ChannelId) { + Write-Host "$subscription.id" + [void]$subscriptionsToTrigger.Add($subscription.id) + } +} + +foreach ($subscriptionToTrigger in $subscriptionsToTrigger) { + try { + $triggerSubscriptionApiEndpoint = "$maestroEndpoint/api/subscriptions/$subscriptionToTrigger/trigger?api-version=$apiVersion" + $headers = Get-Headers 'application/json' $BarToken + + Write-Host "Triggering subscription '$subscriptionToTrigger'..." + + Invoke-WebRequest -Uri $triggerSubscriptionApiEndpoint -Headers $headers -Method Post + + Write-Host "Subscription '$subscriptionToTrigger' triggered!" + } + catch + { + Write-Host "There was an error while triggering subscription '$subscriptionToTrigger'" + Write-Host $_ + Write-Host $_.ScriptStackTrace + $failedTriggeredSubscription = $true + } +} + +if ($failedTriggeredSubscription) { + Write-Host "At least one subscription failed to be triggered..." + ExitWithExitCode 1 +} + +Write-Host "All subscriptions were triggered successfully!" diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 289b5114bdb..d0eec5163ef 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -1,79 +1,79 @@ -[CmdletBinding(PositionalBinding=$false)] -Param( - [string] $configuration = "Debug", - [string] $task, - [string] $verbosity = "minimal", - [string] $msbuildEngine = $null, - [switch] $restore, - [switch] $prepareMachine, - [switch] $help, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties -) - -$ci = $true -$binaryLog = $true -$warnAsError = $true - -. $PSScriptRoot\tools.ps1 - -function Print-Usage() { - Write-Host "Common settings:" - Write-Host " -task Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)" - Write-Host " -restore Restore dependencies" - Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]" - Write-Host " -help Print help and exit" - Write-Host "" - - Write-Host "Advanced settings:" - Write-Host " -prepareMachine Prepare machine for CI run" - Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." - Write-Host "" - Write-Host "Command line arguments not listed above are passed thru to msbuild." -} - -function Build([string]$target) { - $logSuffix = if ($target -eq "Execute") { "" } else { ".$target" } - $log = Join-Path $LogDir "$task$logSuffix.binlog" - $outputPath = Join-Path $ToolsetDir "$task\\" - - MSBuild $taskProject ` - /bl:$log ` - /t:$target ` - /p:Configuration=$configuration ` - /p:RepoRoot=$RepoRoot ` - /p:BaseIntermediateOutputPath=$outputPath ` - @properties -} - -try { - if ($help -or (($null -ne $properties) -and ($properties.Contains("/help") -or $properties.Contains("/?")))) { - Print-Usage - exit 0 - } - - if ($task -eq "") { - Write-Host "Missing required parameter '-task '" -ForegroundColor Red - Print-Usage - ExitWithExitCode 1 - } - - $taskProject = GetSdkTaskProject $task - if (!(Test-Path $taskProject)) { - Write-Host "Unknown task: $task" -ForegroundColor Red - ExitWithExitCode 1 - } - - if ($restore) { - Build "Restore" - } - - Build "Execute" -} -catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - ExitWithExitCode 1 -} - -ExitWithExitCode 0 +[CmdletBinding(PositionalBinding=$false)] +Param( + [string] $configuration = "Debug", + [string] $task, + [string] $verbosity = "minimal", + [string] $msbuildEngine = $null, + [switch] $restore, + [switch] $prepareMachine, + [switch] $help, + [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties +) + +$ci = $true +$binaryLog = $true +$warnAsError = $true + +. $PSScriptRoot\tools.ps1 + +function Print-Usage() { + Write-Host "Common settings:" + Write-Host " -task Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)" + Write-Host " -restore Restore dependencies" + Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]" + Write-Host " -help Print help and exit" + Write-Host "" + + Write-Host "Advanced settings:" + Write-Host " -prepareMachine Prepare machine for CI run" + Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host "" + Write-Host "Command line arguments not listed above are passed thru to msbuild." +} + +function Build([string]$target) { + $logSuffix = if ($target -eq "Execute") { "" } else { ".$target" } + $log = Join-Path $LogDir "$task$logSuffix.binlog" + $outputPath = Join-Path $ToolsetDir "$task\\" + + MSBuild $taskProject ` + /bl:$log ` + /t:$target ` + /p:Configuration=$configuration ` + /p:RepoRoot=$RepoRoot ` + /p:BaseIntermediateOutputPath=$outputPath ` + @properties +} + +try { + if ($help -or (($null -ne $properties) -and ($properties.Contains("/help") -or $properties.Contains("/?")))) { + Print-Usage + exit 0 + } + + if ($task -eq "") { + Write-Host "Missing required parameter '-task '" -ForegroundColor Red + Print-Usage + ExitWithExitCode 1 + } + + $taskProject = GetSdkTaskProject $task + if (!(Test-Path $taskProject)) { + Write-Host "Unknown task: $task" -ForegroundColor Red + ExitWithExitCode 1 + } + + if ($restore) { + Build "Restore" + } + + Build "Execute" +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} + +ExitWithExitCode 0 diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index cfd82eb22f3..0c5451c1141 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index d14b2abe934..0635f26fb63 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -1,97 +1,97 @@ -Param( - [string] $GuardianPackageName, # Required: the name of guardian CLI package (not needed if GuardianCliLocation is specified) - [string] $NugetPackageDirectory, # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified) - [string] $GuardianCliLocation, # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified - [string] $Repository=$env:BUILD_REPOSITORY_NAME, # Required: the name of the repository (e.g. dotnet/arcade) - [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master - [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located - [string] $ArtifactsDirectory = (Join-Path $env:BUILD_SOURCESDIRECTORY ("artifacts")), # Required: the directory where build artifacts are located - [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault - [string[]] $SourceToolsList, # Optional: list of SDL tools to run on source code - [string[]] $ArtifactToolsList, # Optional: list of SDL tools to run on built artifacts - [bool] $TsaPublish=$False, # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH, # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs. - [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME, # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs. - [string] $BuildNumber=$env:BUILD_BUILDNUMBER, # Optional: required for TSA publish; defaults to $(Build.BuildNumber) - [bool] $UpdateBaseline=$False, # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed - [bool] $TsaOnboard=$False, # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs. - [string] $TsaInstanceUrl, # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaCodebaseName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaProjectName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs. - [string] $TsaNotificationEmail, # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs. - [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. - [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. - [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. - [string] $GuardianLoggerLevel="Standard" # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 -$LASTEXITCODE = 0 - -#Replace repo names to the format of org/repo -if (!($Repository.contains('/'))) { - $RepoName = $Repository -replace '(.*?)-(.*)', '$1/$2'; -} -else{ - $RepoName = $Repository; -} - -if ($GuardianPackageName) { - $guardianCliLocation = Join-Path $NugetPackageDirectory (Join-Path $GuardianPackageName (Join-Path "tools" "guardian.cmd")) -} else { - $guardianCliLocation = $GuardianCliLocation -} - -$ValidPath = Test-Path $guardianCliLocation - -if ($ValidPath -eq $False) -{ - Write-Host "Invalid Guardian CLI Location." - exit 1 -} - -& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel -$gdnFolder = Join-Path $ArtifactsDirectory ".gdn" - -if ($TsaOnboard) { - if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) { - Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel" - & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel - if ($LASTEXITCODE -ne 0) { - Write-Host "Guardian tsa-onboard failed with exit code $LASTEXITCODE." - exit $LASTEXITCODE - } - } else { - Write-Host "Could not onboard to TSA -- not all required values ($$TsaCodebaseName, $$TsaNotificationEmail, $$TsaCodebaseAdmin, $$TsaBugAreaPath) were specified." - exit 1 - } -} - -if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -} -if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -} - -if ($UpdateBaseline) { - & (Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Update baseline" -} - -if ($TsaPublish) { - if ($TsaBranchName -and $BuildNumber) { - if (-not $TsaRepositoryName) { - $TsaRepositoryName = "$($Repository)-$($BranchName)" - } - Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $SourceDirectory --logger-level $GuardianLoggerLevel" - & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel - if ($LASTEXITCODE -ne 0) { - Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE." - exit $LASTEXITCODE - } - } else { - Write-Host "Could not publish to TSA -- not all required values ($$TsaBranchName, $$BuildNumber) were specified." - exit 1 - } -} +Param( + [string] $GuardianPackageName, # Required: the name of guardian CLI package (not needed if GuardianCliLocation is specified) + [string] $NugetPackageDirectory, # Required: directory where NuGet packages are installed (not needed if GuardianCliLocation is specified) + [string] $GuardianCliLocation, # Optional: Direct location of Guardian CLI executable if GuardianPackageName & NugetPackageDirectory are not specified + [string] $Repository=$env:BUILD_REPOSITORY_NAME, # Required: the name of the repository (e.g. dotnet/arcade) + [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master + [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located + [string] $ArtifactsDirectory = (Join-Path $env:BUILD_SOURCESDIRECTORY ("artifacts")), # Required: the directory where build artifacts are located + [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault + [string[]] $SourceToolsList, # Optional: list of SDL tools to run on source code + [string[]] $ArtifactToolsList, # Optional: list of SDL tools to run on built artifacts + [bool] $TsaPublish=$False, # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH, # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs. + [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME, # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs. + [string] $BuildNumber=$env:BUILD_BUILDNUMBER, # Optional: required for TSA publish; defaults to $(Build.BuildNumber) + [bool] $UpdateBaseline=$False, # Optional: if true, will update the baseline in the repository; should only be run after fixing any issues which need to be fixed + [bool] $TsaOnboard=$False, # Optional: if true, will onboard the repository to TSA; should only be run once; TSA is the automated framework used to upload test results as bugs. + [string] $TsaInstanceUrl, # Optional: only needed if TsaOnboard or TsaPublish is true; the instance-url registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaCodebaseName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the codebase registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaProjectName, # Optional: only needed if TsaOnboard or TsaPublish is true; the name of the project registered with TSA; TSA is the automated framework used to upload test results as bugs. + [string] $TsaNotificationEmail, # Optional: only needed if TsaOnboard is true; the email(s) which will receive notifications of TSA bug filings (e.g. alias@microsoft.com); TSA is the automated framework used to upload test results as bugs. + [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. + [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. + [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. + [string] $GuardianLoggerLevel="Standard" # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$LASTEXITCODE = 0 + +#Replace repo names to the format of org/repo +if (!($Repository.contains('/'))) { + $RepoName = $Repository -replace '(.*?)-(.*)', '$1/$2'; +} +else{ + $RepoName = $Repository; +} + +if ($GuardianPackageName) { + $guardianCliLocation = Join-Path $NugetPackageDirectory (Join-Path $GuardianPackageName (Join-Path "tools" "guardian.cmd")) +} else { + $guardianCliLocation = $GuardianCliLocation +} + +$ValidPath = Test-Path $guardianCliLocation + +if ($ValidPath -eq $False) +{ + Write-Host "Invalid Guardian CLI Location." + exit 1 +} + +& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel +$gdnFolder = Join-Path $ArtifactsDirectory ".gdn" + +if ($TsaOnboard) { + if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) { + Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel" + & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian tsa-onboard failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + } else { + Write-Host "Could not onboard to TSA -- not all required values ($$TsaCodebaseName, $$TsaNotificationEmail, $$TsaCodebaseAdmin, $$TsaBugAreaPath) were specified." + exit 1 + } +} + +if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel +} +if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel +} + +if ($UpdateBaseline) { + & (Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Update baseline" +} + +if ($TsaPublish) { + if ($TsaBranchName -and $BuildNumber) { + if (-not $TsaRepositoryName) { + $TsaRepositoryName = "$($Repository)-$($BranchName)" + } + Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $SourceDirectory --logger-level $GuardianLoggerLevel" + & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + } else { + Write-Host "Could not publish to TSA -- not all required values ($$TsaBranchName, $$BuildNumber) were specified." + exit 1 + } +} diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 new file mode 100644 index 00000000000..1fdbb14329c --- /dev/null +++ b/eng/common/sdl/extract-artifact-packages.ps1 @@ -0,0 +1,70 @@ +param( + [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where artifact packages are stored + [Parameter(Mandatory=$true)][string] $ExtractPath # Full path to directory where the packages will be extracted +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$ExtractPackage = { + param( + [string] $PackagePath # Full path to a NuGet package + ) + + if (!(Test-Path $PackagePath)) { + Write-PipelineTaskError "Input file does not exist: $PackagePath" + ExitWithExitCode 1 + } + + $RelevantExtensions = @(".dll", ".exe", ".pdb") + Write-Host -NoNewLine "Extracting" ([System.IO.Path]::GetFileName($PackagePath)) "... " + + $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath) + $ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId + + Add-Type -AssemblyName System.IO.Compression.FileSystem + + [System.IO.Directory]::CreateDirectory($ExtractPath); + + try { + $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) + + $zip.Entries | + Where-Object {$RelevantExtensions -contains [System.IO.Path]::GetExtension($_.Name)} | + ForEach-Object { + $TargetFile = Join-Path -Path $ExtractPath -ChildPath $_.Name + + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) + } + } + catch { + + } + finally { + $zip.Dispose() + } + } + function ExtractArtifacts { + if (!(Test-Path $InputPath)) { + Write-Host "Input Path does not exist: $InputPath" + ExitWithExitCode 0 + } + $Jobs = @() + Get-ChildItem "$InputPath\*.nupkg" | + ForEach-Object { + $Jobs += Start-Job -ScriptBlock $ExtractPackage -ArgumentList $_.FullName + } + + foreach ($Job in $Jobs) { + Wait-Job -Id $Job.Id | Receive-Job + } +} + +try { + Measure-Command { ExtractArtifacts } +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 7e97217e803..26e01c0673c 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -1,48 +1,48 @@ -Param( - [string] $GuardianCliLocation, - [string] $Repository, - [string] $BranchName="master", - [string] $WorkingDirectory, - [string] $AzureDevOpsAccessToken, - [string] $GuardianLoggerLevel="Standard" -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 -$LASTEXITCODE = 0 - -# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file -$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) -$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") -$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0-preview.1" -$zipFile = "$WorkingDirectory/gdn.zip" - -Add-Type -AssemblyName System.IO.Compression.FileSystem -$gdnFolder = (Join-Path $WorkingDirectory ".gdn") -Try -{ - # We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead - Write-Host "Downloading gdn folder from internal config repostiory..." - Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile - if (Test-Path $gdnFolder) { - # Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case) - Remove-Item -Force -Recurse $gdnFolder - } - [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory) - Write-Host $gdnFolder -} Catch [System.Net.WebException] { - # if the folder does not exist, we'll do a guardian init and push it to the remote repository - Write-Host "Initializing Guardian..." - Write-Host "$GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel" - & $GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel - if ($LASTEXITCODE -ne 0) { - Write-Error "Guardian init failed with exit code $LASTEXITCODE." - } - # We create the mainbaseline so it can be edited later - Write-Host "$GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline" - & $GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline - if ($LASTEXITCODE -ne 0) { - Write-Error "Guardian baseline failed with exit code $LASTEXITCODE." - } - & $(Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $Repository -BranchName $BranchName -GdnFolder $gdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Initialize gdn folder" +Param( + [string] $GuardianCliLocation, + [string] $Repository, + [string] $BranchName="master", + [string] $WorkingDirectory, + [string] $AzureDevOpsAccessToken, + [string] $GuardianLoggerLevel="Standard" +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$LASTEXITCODE = 0 + +# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file +$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) +$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") +$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0-preview.1" +$zipFile = "$WorkingDirectory/gdn.zip" + +Add-Type -AssemblyName System.IO.Compression.FileSystem +$gdnFolder = (Join-Path $WorkingDirectory ".gdn") +Try +{ + # We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead + Write-Host "Downloading gdn folder from internal config repostiory..." + Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile + if (Test-Path $gdnFolder) { + # Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case) + Remove-Item -Force -Recurse $gdnFolder + } + [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory) + Write-Host $gdnFolder +} Catch [System.Net.WebException] { + # if the folder does not exist, we'll do a guardian init and push it to the remote repository + Write-Host "Initializing Guardian..." + Write-Host "$GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel" + & $GuardianCliLocation init --working-directory $WorkingDirectory --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-Error "Guardian init failed with exit code $LASTEXITCODE." + } + # We create the mainbaseline so it can be edited later + Write-Host "$GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline" + & $GuardianCliLocation baseline --working-directory $WorkingDirectory --name mainbaseline + if ($LASTEXITCODE -ne 0) { + Write-Error "Guardian baseline failed with exit code $LASTEXITCODE." + } + & $(Join-Path $PSScriptRoot "push-gdn.ps1") -Repository $Repository -BranchName $BranchName -GdnFolder $gdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason "Initialize gdn folder" } \ No newline at end of file diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 61827640830..fb9b7128637 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/eng/common/sdl/push-gdn.ps1 b/eng/common/sdl/push-gdn.ps1 index 5b18ed8e652..79c707d6d8a 100644 --- a/eng/common/sdl/push-gdn.ps1 +++ b/eng/common/sdl/push-gdn.ps1 @@ -1,51 +1,51 @@ -Param( - [string] $Repository, - [string] $BranchName="master", - [string] $GdnFolder, - [string] $AzureDevOpsAccessToken, - [string] $PushReason -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 -$LASTEXITCODE = 0 - -# We create the temp directory where we'll store the sdl-config repository -$sdlDir = Join-Path $env:TEMP "sdl" -if (Test-Path $sdlDir) { - Remove-Item -Force -Recurse $sdlDir -} - -Write-Host "git clone https://dnceng:`$AzureDevOpsAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir" -git clone https://dnceng:$AzureDevOpsAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir -if ($LASTEXITCODE -ne 0) { - Write-Error "Git clone failed with exit code $LASTEXITCODE." -} -# We copy the .gdn folder from our local run into the git repository so it can be committed -$sdlRepositoryFolder = Join-Path (Join-Path (Join-Path $sdlDir $Repository) $BranchName) ".gdn" -if (Get-Command Robocopy) { - Robocopy /S $GdnFolder $sdlRepositoryFolder -} else { - rsync -r $GdnFolder $sdlRepositoryFolder -} -# cd to the sdl-config directory so we can run git there -Push-Location $sdlDir -# git add . --> git commit --> git push -Write-Host "git add ." -git add . -if ($LASTEXITCODE -ne 0) { - Write-Error "Git add failed with exit code $LASTEXITCODE." -} -Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" -git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" -if ($LASTEXITCODE -ne 0) { - Write-Error "Git commit failed with exit code $LASTEXITCODE." -} -Write-Host "git push" -git push -if ($LASTEXITCODE -ne 0) { - Write-Error "Git push failed with exit code $LASTEXITCODE." -} - -# Return to the original directory +Param( + [string] $Repository, + [string] $BranchName="master", + [string] $GdnFolder, + [string] $AzureDevOpsAccessToken, + [string] $PushReason +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$LASTEXITCODE = 0 + +# We create the temp directory where we'll store the sdl-config repository +$sdlDir = Join-Path $env:TEMP "sdl" +if (Test-Path $sdlDir) { + Remove-Item -Force -Recurse $sdlDir +} + +Write-Host "git clone https://dnceng:`$AzureDevOpsAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir" +git clone https://dnceng:$AzureDevOpsAccessToken@dev.azure.com/dnceng/internal/_git/sdl-tool-cfg $sdlDir +if ($LASTEXITCODE -ne 0) { + Write-Error "Git clone failed with exit code $LASTEXITCODE." +} +# We copy the .gdn folder from our local run into the git repository so it can be committed +$sdlRepositoryFolder = Join-Path (Join-Path (Join-Path $sdlDir $Repository) $BranchName) ".gdn" +if (Get-Command Robocopy) { + Robocopy /S $GdnFolder $sdlRepositoryFolder +} else { + rsync -r $GdnFolder $sdlRepositoryFolder +} +# cd to the sdl-config directory so we can run git there +Push-Location $sdlDir +# git add . --> git commit --> git push +Write-Host "git add ." +git add . +if ($LASTEXITCODE -ne 0) { + Write-Error "Git add failed with exit code $LASTEXITCODE." +} +Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" +git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" +if ($LASTEXITCODE -ne 0) { + Write-Error "Git commit failed with exit code $LASTEXITCODE." +} +Write-Host "git push" +git push +if ($LASTEXITCODE -ne 0) { + Write-Error "Git push failed with exit code $LASTEXITCODE." +} + +# Return to the original directory Pop-Location \ No newline at end of file diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index 6f2e9a9dbb9..e6a86d03a21 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -1,65 +1,65 @@ -Param( - [string] $GuardianCliLocation, - [string] $WorkingDirectory, - [string] $TargetDirectory, - [string] $GdnFolder, - [string[]] $ToolsList, - [string] $UpdateBaseline, - [string] $GuardianLoggerLevel="Standard" -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 -$LASTEXITCODE = 0 - -# We store config files in the r directory of .gdn -Write-Host $ToolsList -$gdnConfigPath = Join-Path $GdnFolder "r" -$ValidPath = Test-Path $GuardianCliLocation - -if ($ValidPath -eq $False) -{ - Write-Host "Invalid Guardian CLI Location." - exit 1 -} - -foreach ($tool in $ToolsList) { - $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig" - $config = $False - Write-Host $tool - # We have to manually configure tools that run on source to look at the source directory only - if ($tool -eq "credscan") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `"" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " - if ($LASTEXITCODE -ne 0) { - Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." - exit $LASTEXITCODE - } - $config = $True - } - if ($tool -eq "policheck") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `"" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " - if ($LASTEXITCODE -ne 0) { - Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." - exit $LASTEXITCODE - } - $config = $True - } - - Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile $config" - if ($config) { - & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile - if ($LASTEXITCODE -ne 0) { - Write-Host "Guardian run for $tool using $gdnConfigFile failed with exit code $LASTEXITCODE." - exit $LASTEXITCODE - } - } else { - & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel - if ($LASTEXITCODE -ne 0) { - Write-Host "Guardian run for $tool failed with exit code $LASTEXITCODE." - exit $LASTEXITCODE - } - } -} - +Param( + [string] $GuardianCliLocation, + [string] $WorkingDirectory, + [string] $TargetDirectory, + [string] $GdnFolder, + [string[]] $ToolsList, + [string] $UpdateBaseline, + [string] $GuardianLoggerLevel="Standard" +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +$LASTEXITCODE = 0 + +# We store config files in the r directory of .gdn +Write-Host $ToolsList +$gdnConfigPath = Join-Path $GdnFolder "r" +$ValidPath = Test-Path $GuardianCliLocation + +if ($ValidPath -eq $False) +{ + Write-Host "Invalid Guardian CLI Location." + exit 1 +} + +foreach ($tool in $ToolsList) { + $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig" + $config = $False + Write-Host $tool + # We have to manually configure tools that run on source to look at the source directory only + if ($tool -eq "credscan") { + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `"" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + $config = $True + } + if ($tool -eq "policheck") { + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `"" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + $config = $True + } + + Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile $config" + if ($config) { + & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian run for $tool using $gdnConfigFile failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + } else { + & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel + if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian run for $tool failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE + } + } +} + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 3a6273c1ba4..5837f3d56d3 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -1,44 +1,54 @@ -parameters: - overrideParameters: '' # Optional: to override values for parameters. - additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' - continueOnError: false # optional: determines whether to continue the build if the step errors; - dependsOn: '' # Optional: dependencies of the job - -jobs: -- job: Run_SDL - dependsOn: ${{ parameters.dependsOn }} - displayName: Run SDL tool - variables: - - group: DotNet-VSTS-Bot - steps: - - checkout: self - clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages - - ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.continueOnError }} - - ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.6.0 - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.continueOnError }} +parameters: + overrideParameters: '' # Optional: to override values for parameters. + additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + continueOnError: false # optional: determines whether to continue the build if the step errors; + dependsOn: '' # Optional: dependencies of the job + +jobs: +- job: Run_SDL + dependsOn: ${{ parameters.dependsOn }} + displayName: Run SDL tool + variables: + - group: DotNet-VSTS-Bot + steps: + - checkout: self + clean: true + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + matchingPattern: "**" + downloadPath: $(Build.SourcesDirectory)\artifacts + - powershell: eng/common/sdl/extract-artifact-packages.ps1 + -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts + -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts + displayName: Extract Blob Artifacts + continueOnError: ${{ parameters.continueOnError }} + - powershell: eng/common/sdl/extract-artifact-packages.ps1 + -InputPath $(Build.SourcesDirectory)\artifacts\PackageArtifacts + -ExtractPath $(Build.SourcesDirectory)\artifacts\PackageArtifacts + displayName: Extract Package Artifacts + continueOnError: ${{ parameters.continueOnError }} + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + - task: NuGetCommand@2 + displayName: 'Install Guardian' + inputs: + restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config + externalFeedCredentials: GuardianConnect + restoreDirectory: $(Build.SourcesDirectory)\.packages + - ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.continueOnError }} + - ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 + -GuardianPackageName Microsoft.Guardian.Cli.0.6.0 + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates/job/generate-graph-files.yml b/eng/common/templates/job/generate-graph-files.yml index 37aa55fd407..e54ce956f90 100644 --- a/eng/common/templates/job/generate-graph-files.yml +++ b/eng/common/templates/job/generate-graph-files.yml @@ -1,48 +1,48 @@ -parameters: - # Optional: dependencies of the job - dependsOn: '' - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: {} - - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - -jobs: -- job: Generate_Graph_Files - - dependsOn: ${{ parameters.dependsOn }} - - displayName: Generate Graph Files - - pool: ${{ parameters.pool }} - - variables: - # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT - # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat - - group: Publish-Build-Assets - - group: DotNet-AllOrgs-Darc-Pats - - name: _GraphArguments - value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) - -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) - -barToken $(MaestroAccessToken) - -outputFolder '$(Build.StagingDirectory)/GraphFiles/' - - ${{ if ne(parameters.includeToolset, 'false') }}: - - name: _GraphArguments - value: ${{ variables._GraphArguments }} -includeToolset - - steps: - - task: PowerShell@2 - displayName: Generate Graph Files - inputs: - filePath: eng\common\generate-graph-files.ps1 - arguments: $(_GraphArguments) - continueOnError: true - - task: PublishBuildArtifacts@1 - displayName: Publish Graph to Artifacts - inputs: - PathtoPublish: '$(Build.StagingDirectory)/GraphFiles' - PublishLocation: Container - ArtifactName: GraphFiles - continueOnError: true - condition: always() +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + +jobs: +- job: Generate_Graph_Files + + dependsOn: ${{ parameters.dependsOn }} + + displayName: Generate Graph Files + + pool: ${{ parameters.pool }} + + variables: + # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT + # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat + - group: Publish-Build-Assets + - group: DotNet-AllOrgs-Darc-Pats + - name: _GraphArguments + value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) + -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) + -barToken $(MaestroAccessToken) + -outputFolder '$(Build.StagingDirectory)/GraphFiles/' + - ${{ if ne(parameters.includeToolset, 'false') }}: + - name: _GraphArguments + value: ${{ variables._GraphArguments }} -includeToolset + + steps: + - task: PowerShell@2 + displayName: Generate Graph Files + inputs: + filePath: eng\common\generate-graph-files.ps1 + arguments: $(_GraphArguments) + continueOnError: true + - task: PublishBuildArtifacts@1 + displayName: Publish Graph to Artifacts + inputs: + PathtoPublish: '$(Build.StagingDirectory)/GraphFiles' + PublishLocation: Container + ArtifactName: GraphFiles + continueOnError: true + condition: always() diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index a83e0754283..1814e0ab612 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -1,205 +1,205 @@ -parameters: -# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - cancelTimeoutInMinutes: '' - - condition: '' - - continueOnError: false - - container: '' - - dependsOn: '' - - displayName: '' - - steps: [] - - pool: '' - - strategy: '' - - timeoutInMinutes: '' - - variables: [] - - workspace: '' - -# Job base template specific parameters - # Optional: Enable installing Microbuild plugin - # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix - # _TeamName - the name of your team - # _SignType - 'test' or 'real' - enableMicrobuild: false - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: Enable publishing to the build asset registry - enablePublishBuildAssets: false - - # Optional: Include PublishTestResults task - enablePublishTestResults: false - - # Optional: enable sending telemetry - enableTelemetry: false - - # Optional: define the helix repo for telemetry (example: 'dotnet/arcade') - helixRepo: '' - - # Optional: define the helix type for telemetry (example: 'build/product/') - helixType: '' - - # Required: name of the job - name: '' - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -jobs: -- job: ${{ parameters.name }} - - ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: - cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} - - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - - ${{ if ne(parameters.container, '') }}: - container: ${{ parameters.container }} - - ${{ if ne(parameters.continueOnError, '') }}: - continueOnError: ${{ parameters.continueOnError }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - - ${{ if ne(parameters.strategy, '') }}: - strategy: ${{ parameters.strategy }} - - ${{ if ne(parameters.timeoutInMinutes, '') }}: - timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - - variables: - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - - name: DOTNET_CLI_TELEMETRY_PROFILE - value: '$(Build.Repository.Uri)' - - ${{ each variable in parameters.variables }}: - # handle name-value variable syntax - # example: - # - name: [key] - # value: [value] - - ${{ if ne(variable.name, '') }}: - - name: ${{ variable.name }} - value: ${{ variable.value }} - - # handle variable groups - - ${{ if ne(variable.group, '') }}: - - group: ${{ variable.group }} - - # handle key-value variable syntax. - # example: - # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: - - ${{ each pair in variable }}: - - name: ${{ pair.key }} - value: ${{ pair.value }} - - # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds - - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: DotNet-HelixApi-Access - - ${{ if ne(parameters.workspace, '') }}: - workspace: ${{ parameters.workspace }} - - steps: - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - # Telemetry tasks are built from https://github.com/dotnet/arcade-extensions - - task: sendStartTelemetry@0 - displayName: 'Send Helix Start Telemetry' - inputs: - helixRepo: ${{ parameters.helixRepo }} - ${{ if ne(parameters.helixType, '') }}: - helixType: ${{ parameters.helixType }} - buildConfig: $(_BuildConfig) - runAsPublic: ${{ parameters.runAsPublic }} - continueOnError: ${{ parameters.continueOnError }} - condition: always() - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildSigningPlugin@2 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - env: - TeamName: $(_TeamName) - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - - ${{ each step in parameters.steps }}: - - ${{ step }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - env: - TeamName: $(_TeamName) - - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - # Telemetry tasks are built from https://github.com/dotnet/arcade-extensions - - task: sendEndTelemetry@0 - displayName: 'Send Helix End Telemetry' - continueOnError: ${{ parameters.continueOnError }} - condition: always() - - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - task: PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: $(Agent.Os)_$(Agent.JobName) - continueOnError: true - condition: always() - - - ${{ if eq(parameters.enablePublishTestResults, 'true') }}: - - task: PublishTestResults@2 - displayName: Publish Test Results - inputs: - testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - continueOnError: true - condition: always() - - - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(variables['_PublishUsingPipelines'], 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: CopyFiles@2 - displayName: Gather Asset Manifests - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' - TargetFolder: '$(Build.StagingDirectory)/AssetManifests' - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) - - task: PublishBuildArtifacts@1 - displayName: Push Asset Manifests - inputs: - PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' - PublishLocation: Container - ArtifactName: AssetManifests - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + + condition: '' + + continueOnError: false + + container: '' + + dependsOn: '' + + displayName: '' + + steps: [] + + pool: '' + + strategy: '' + + timeoutInMinutes: '' + + variables: [] + + workspace: '' + +# Job base template specific parameters + # Optional: Enable installing Microbuild plugin + # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix + # _TeamName - the name of your team + # _SignType - 'test' or 'real' + enableMicrobuild: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing to the build asset registry + enablePublishBuildAssets: false + + # Optional: Include PublishTestResults task + enablePublishTestResults: false + + # Optional: enable sending telemetry + enableTelemetry: false + + # Optional: define the helix repo for telemetry (example: 'dotnet/arcade') + helixRepo: '' + + # Optional: define the helix type for telemetry (example: 'build/product/') + helixType: '' + + # Required: name of the job + name: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + variables: + - ${{ if eq(parameters.enableTelemetry, 'true') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if eq(parameters.enableTelemetry, 'true') }}: + # Telemetry tasks are built from https://github.com/dotnet/arcade-extensions + - task: sendStartTelemetry@0 + displayName: 'Send Helix Start Telemetry' + inputs: + helixRepo: ${{ parameters.helixRepo }} + ${{ if ne(parameters.helixType, '') }}: + helixType: ${{ parameters.helixType }} + buildConfig: $(_BuildConfig) + runAsPublic: ${{ parameters.runAsPublic }} + continueOnError: ${{ parameters.continueOnError }} + condition: always() + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildSigningPlugin@2 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + - ${{ if eq(parameters.enableTelemetry, 'true') }}: + # Telemetry tasks are built from https://github.com/dotnet/arcade-extensions + - task: sendEndTelemetry@0 + displayName: 'Send Helix End Telemetry' + continueOnError: ${{ parameters.continueOnError }} + condition: always() + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - task: PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: $(Agent.Os)_$(Agent.JobName) + continueOnError: true + condition: always() + + - ${{ if eq(parameters.enablePublishTestResults, 'true') }}: + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + continueOnError: true + condition: always() + + - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(variables['_PublishUsingPipelines'], 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + - task: PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 5acaeb564fa..9e77ef1b54b 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -1,84 +1,84 @@ -parameters: - configuration: 'Debug' - - # Optional: condition for the job to run - condition: '' - - # Optional: 'true' if future jobs should run even if this job fails - continueOnError: false - - # Optional: dependencies of the job - dependsOn: '' - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: {} - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishUsingPipelines: false - -jobs: -- job: Asset_Registry_Publish - - dependsOn: ${{ parameters.dependsOn }} - - displayName: Publish to Build Asset Registry - - pool: ${{ parameters.pool }} - - variables: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - name: _BuildConfig - value: ${{ parameters.configuration }} - - group: Publish-Build-Assets - - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: PowerShell@2 - displayName: Publish Build Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:Configuration=$(_BuildConfig) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - - task: PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: $(Agent.Os)_PublishBuildAssets - continueOnError: true - condition: always() +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + + displayName: Publish to Build Asset Registry + + pool: ${{ parameters.pool }} + + variables: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _BuildConfig + value: ${{ parameters.configuration }} + - group: Publish-Build-Assets + + steps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:BuildAssetRegistryToken=$(MaestroAccessToken) + /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:Configuration=$(_BuildConfig) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + - task: PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: $(Agent.Os)_PublishBuildAssets + continueOnError: true + condition: always() diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index f68dbe0df63..6a2f98c036f 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -1,90 +1,90 @@ -parameters: - # Optional: 'true' if failures in job.yml job should not fail the job - continueOnError: false - - # Optional: Enable installing Microbuild plugin - # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix - # _TeamName - the name of your team - # _SignType - 'test' or 'real' - enableMicrobuild: false - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: Enable publishing to the build asset registry - enablePublishBuildAssets: false - - # Optional: Enable publishing using release pipelines - enablePublishUsingPipelines: false - - graphFileGeneration: - # Optional: Enable generating the graph files at the end of the build - enabled: false - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - - # Optional: Include PublishTestResults task - enablePublishTestResults: false - - # Optional: enable sending telemetry - # if enabled then the 'helixRepo' parameter should also be specified - enableTelemetry: false - - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - - # Optional: define the helix repo for telemetry (example: 'dotnet/arcade') - helixRepo: '' - - # Optional: Override automatically derived dependsOn value for "publish build assets" job - publishBuildAssetsDependsOn: '' - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -jobs: -- ${{ each job in parameters.jobs }}: - - template: ../job/job.yml - parameters: - # pass along parameters - ${{ each parameter in parameters }}: - ${{ if ne(parameter.key, 'jobs') }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # pass along job properties - ${{ each property in job }}: - ${{ if ne(property.key, 'job') }}: - ${{ property.key }}: ${{ property.value }} - - name: ${{ job.job }} - -- ${{ if and(eq(parameters.enablePublishBuildAssets, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: ../job/publish-build-assets.yml - parameters: - continueOnError: ${{ parameters.continueOnError }} - dependsOn: - - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.publishBuildAssetsDependsOn }}: - - ${{ job.job }} - - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.jobs }}: - - ${{ job.job }} - pool: - vmImage: vs2017-win2016 - runAsPublic: ${{ parameters.runAsPublic }} - publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} - enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} - -- ${{ if and(eq(parameters.graphFileGeneration.enabled, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: ../job/generate-graph-files.yml - parameters: - continueOnError: ${{ parameters.continueOnError }} - includeToolset: ${{ parameters.graphFileGeneration.includeToolset }} - dependsOn: - - Asset_Registry_Publish - pool: - vmImage: vs2017-win2016 +parameters: + # Optional: 'true' if failures in job.yml job should not fail the job + continueOnError: false + + # Optional: Enable installing Microbuild plugin + # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix + # _TeamName - the name of your team + # _SignType - 'test' or 'real' + enableMicrobuild: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing to the build asset registry + enablePublishBuildAssets: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Optional: Include PublishTestResults task + enablePublishTestResults: false + + # Optional: enable sending telemetry + # if enabled then the 'helixRepo' parameter should also be specified + enableTelemetry: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: define the helix repo for telemetry (example: 'dotnet/arcade') + helixRepo: '' + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- ${{ each job in parameters.jobs }}: + - template: ../job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if and(eq(parameters.enablePublishBuildAssets, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: ../job/publish-build-assets.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + pool: + vmImage: vs2017-win2016 + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + +- ${{ if and(eq(parameters.graphFileGeneration.enabled, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: ../job/generate-graph-files.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + includeToolset: ${{ parameters.graphFileGeneration.includeToolset }} + dependsOn: + - Asset_Registry_Publish + pool: + vmImage: vs2017-win2016 diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml index 255543cc468..0123cf43b16 100644 --- a/eng/common/templates/phases/base.yml +++ b/eng/common/templates/phases/base.yml @@ -1,130 +1,130 @@ -parameters: - # Optional: Clean sources before building - clean: true - - # Optional: Git fetch depth - fetchDepth: '' - - # Optional: name of the phase (not specifying phase name may cause name collisions) - name: '' - # Optional: display name of the phase - displayName: '' - - # Optional: condition for the job to run - condition: '' - - # Optional: dependencies of the phase - dependsOn: '' - - # Required: A defined YAML queue - queue: {} - - # Required: build steps - steps: [] - - # Optional: variables - variables: {} - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - ## Telemetry variables - - # Optional: enable sending telemetry - # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix - # _HelixBuildConfig - differentiate between Debug, Release, other - # _HelixSource - Example: build/product - # _HelixType - Example: official/dotnet/arcade/$(Build.SourceBranch) - enableTelemetry: false - - # Optional: Enable installing Microbuild plugin - # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix - # _TeamName - the name of your team - # _SignType - 'test' or 'real' - enableMicrobuild: false - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -phases: -- phase: ${{ parameters.name }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - queue: ${{ parameters.queue }} - - ${{ if ne(parameters.variables, '') }}: - variables: - ${{ insert }}: ${{ parameters.variables }} - - steps: - - checkout: self - clean: ${{ parameters.clean }} - ${{ if ne(parameters.fetchDepth, '') }}: - fetchDepth: ${{ parameters.fetchDepth }} - - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - - template: /eng/common/templates/steps/telemetry-start.yml - parameters: - buildConfig: $(_HelixBuildConfig) - helixSource: $(_HelixSource) - helixType: $(_HelixType) - runAsPublic: ${{ parameters.runAsPublic }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - # Internal only resource, and Microbuild signing shouldn't be applied to PRs. - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildSigningPlugin@2 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - - env: - TeamName: $(_TeamName) - continueOnError: false - condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - # Run provided build steps - - ${{ parameters.steps }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - # Internal only resources - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - env: - TeamName: $(_TeamName) - - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - - template: /eng/common/templates/steps/telemetry-end.yml - parameters: - helixSource: $(_HelixSource) - helixType: $(_HelixType) - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: CopyFiles@2 - displayName: Gather Asset Manifests - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' - TargetFolder: '$(Build.StagingDirectory)/AssetManifests' - continueOnError: false - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) - - task: PublishBuildArtifacts@1 - displayName: Push Asset Manifests - inputs: - PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' - PublishLocation: Container - ArtifactName: AssetManifests - continueOnError: false - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) +parameters: + # Optional: Clean sources before building + clean: true + + # Optional: Git fetch depth + fetchDepth: '' + + # Optional: name of the phase (not specifying phase name may cause name collisions) + name: '' + # Optional: display name of the phase + displayName: '' + + # Optional: condition for the job to run + condition: '' + + # Optional: dependencies of the phase + dependsOn: '' + + # Required: A defined YAML queue + queue: {} + + # Required: build steps + steps: [] + + # Optional: variables + variables: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + ## Telemetry variables + + # Optional: enable sending telemetry + # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix + # _HelixBuildConfig - differentiate between Debug, Release, other + # _HelixSource - Example: build/product + # _HelixType - Example: official/dotnet/arcade/$(Build.SourceBranch) + enableTelemetry: false + + # Optional: Enable installing Microbuild plugin + # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix + # _TeamName - the name of your team + # _SignType - 'test' or 'real' + enableMicrobuild: false + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +phases: +- phase: ${{ parameters.name }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + queue: ${{ parameters.queue }} + + ${{ if ne(parameters.variables, '') }}: + variables: + ${{ insert }}: ${{ parameters.variables }} + + steps: + - checkout: self + clean: ${{ parameters.clean }} + ${{ if ne(parameters.fetchDepth, '') }}: + fetchDepth: ${{ parameters.fetchDepth }} + + - ${{ if eq(parameters.enableTelemetry, 'true') }}: + - template: /eng/common/templates/steps/telemetry-start.yml + parameters: + buildConfig: $(_HelixBuildConfig) + helixSource: $(_HelixSource) + helixType: $(_HelixType) + runAsPublic: ${{ parameters.runAsPublic }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + # Internal only resource, and Microbuild signing shouldn't be applied to PRs. + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildSigningPlugin@2 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + + env: + TeamName: $(_TeamName) + continueOnError: false + condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + + # Run provided build steps + - ${{ parameters.steps }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + # Internal only resources + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + env: + TeamName: $(_TeamName) + + - ${{ if eq(parameters.enableTelemetry, 'true') }}: + - template: /eng/common/templates/steps/telemetry-end.yml + parameters: + helixSource: $(_HelixSource) + helixType: $(_HelixType) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: CopyFiles@2 + displayName: Gather Asset Manifests + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + continueOnError: false + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + - task: PublishBuildArtifacts@1 + displayName: Push Asset Manifests + inputs: + PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' + PublishLocation: Container + ArtifactName: AssetManifests + continueOnError: false + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml index aef29ecf3ea..a0a8074282a 100644 --- a/eng/common/templates/phases/publish-build-assets.yml +++ b/eng/common/templates/phases/publish-build-assets.yml @@ -1,51 +1,51 @@ -parameters: - dependsOn: '' - queue: {} - configuration: 'Debug' - condition: succeeded() - continueOnError: false - runAsPublic: false - publishUsingPipelines: false -phases: - - phase: Asset_Registry_Publish - displayName: Publish to Build Asset Registry - dependsOn: ${{ parameters.dependsOn }} - queue: ${{ parameters.queue }} - variables: - _BuildConfig: ${{ parameters.configuration }} - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: AzureKeyVault@1 - inputs: - azureSubscription: 'DotNet-Engineering-Services_KeyVault' - KeyVaultName: EngKeyVault - SecretsFilter: 'MaestroAccessToken' - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: PowerShell@2 - displayName: Publish Build Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:Configuration=$(_BuildConfig) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: $(Agent.Os)_Asset_Registry_Publish - continueOnError: true - condition: always() +parameters: + dependsOn: '' + queue: {} + configuration: 'Debug' + condition: succeeded() + continueOnError: false + runAsPublic: false + publishUsingPipelines: false +phases: + - phase: Asset_Registry_Publish + displayName: Publish to Build Asset Registry + dependsOn: ${{ parameters.dependsOn }} + queue: ${{ parameters.queue }} + variables: + _BuildConfig: ${{ parameters.configuration }} + steps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + - task: AzureKeyVault@1 + inputs: + azureSubscription: 'DotNet-Engineering-Services_KeyVault' + KeyVaultName: EngKeyVault + SecretsFilter: 'MaestroAccessToken' + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:BuildAssetRegistryToken=$(MaestroAccessToken) + /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:Configuration=$(_BuildConfig) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: $(Agent.Os)_Asset_Registry_Publish + continueOnError: true + condition: always() diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml new file mode 100644 index 00000000000..808d46b17f2 --- /dev/null +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -0,0 +1,170 @@ +parameters: + enableSymbolValidation: true + +stages: +- stage: IS_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: Internal Servicing + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Artifacts + inputs: + downloadType: specific files + matchingPattern: "*Artifacts*" + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:Configuration=Release + + - job: publish_assets + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Add Assets Location + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(InternalServicing_30_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' + /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + + - template: ../trigger-subscription.yml + parameters: + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + +- stage: IS_PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: + - job: + displayName: Symbol Availability + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Check Symbol Availability + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) + + - job: + displayName: Gather Drop + dependsOn: setupMaestroVars + variables: + BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Setup Darc CLI + inputs: + targetType: filePath + filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' + + - task: PowerShell@2 + displayName: Run Darc gather-drop + inputs: + targetType: inline + script: | + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location + enabled: false + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index f924bc979b6..79c6822db72 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -1,162 +1,166 @@ -parameters: - enableSymbolValidation: true - -stages: -- stage: Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: Developer Channel - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Artifacts - inputs: - downloadType: specific files - matchingPattern: "*Artifacts*" - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:Configuration=Release - - - job: - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: PowerShell@2 - displayName: Add Assets Location - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicDevRelease_30_Channel_Id) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' - /p:BuildAssetRegistryToken='$(MaestroAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - - - task: NuGetCommand@2 - displayName: Publish Packages to AzDO Feed - condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') - inputs: - command: push - vstsFeed: $(AzDoFeedName) - packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg - publishVstsFeed: $(AzDoFeedName) - - - task: PowerShell@2 - displayName: Publish Blobs to AzDO Feed - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) - -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) - enabled: false - - -- stage: PublishValidation - displayName: Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Check Symbol Availability - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - - job: - displayName: Gather Drop - dependsOn: setupMaestroVars - variables: - BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Setup Darc CLI - inputs: - targetType: filePath - filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' - - - task: PowerShell@2 - displayName: Run Darc gather-drop - inputs: - targetType: inline - script: | - darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location +parameters: + enableSymbolValidation: true + +stages: +- stage: Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: Developer Channel + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Artifacts + inputs: + downloadType: specific files + matchingPattern: "*Artifacts*" + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:Configuration=Release + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Add Assets Location + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(PublicDevRelease_30_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' + /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + + +- stage: PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: + - job: + displayName: Symbol Availability + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Check Symbol Availability + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) + + - job: + displayName: Gather Drop + dependsOn: setupMaestroVars + variables: + BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Setup Darc CLI + inputs: + targetType: filePath + filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' + + - task: PowerShell@2 + displayName: Run Darc gather-drop + inputs: + targetType: inline + script: | + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml new file mode 100644 index 00000000000..25923020df8 --- /dev/null +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -0,0 +1,170 @@ +parameters: + enableSymbolValidation: true + +stages: +- stage: PubRel_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: Public Release + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Artifacts + inputs: + downloadType: specific files + matchingPattern: "*Artifacts*" + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:Configuration=Release + + - job: publish_assets + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Publish + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(PublicRelease_30_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)/Nuget/NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' + /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + + - template: ../trigger-subscription.yml + parameters: + ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} + +- stage: PubRel_PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: + - job: + displayName: Symbol Availability + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Check Symbol Availability + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) + + - job: + displayName: Gather Drop + dependsOn: setupMaestroVars + variables: + BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Setup Darc CLI + inputs: + targetType: filePath + filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' + + - task: PowerShell@2 + displayName: Run Darc gather-drop + inputs: + targetType: inline + script: | + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location + enabled: false + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 083c568570c..114477d3adb 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -1,115 +1,119 @@ -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: Validation Channel - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: PowerShell@2 - displayName: Add Assets Location - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' - /p:BuildAssetRegistryToken='$(MaestroAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' - /p:Configuration=Release - - - task: NuGetCommand@2 - displayName: Publish Packages to AzDO Feed - condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') - inputs: - command: push - vstsFeed: $(AzDoFeedName) - packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg - publishVstsFeed: $(AzDoFeedName) - - - task: PowerShell@2 - displayName: Publish Blobs to AzDO Feed - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) - -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) - enabled: false - - -- stage: PVR_PublishValidation - displayName: Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Gather Drop - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - group: Publish-Build-Assets - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Setup Darc CLI - inputs: - targetType: filePath - filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' - - - task: PowerShell@2 - displayName: Run Darc gather-drop - inputs: - targetType: inline - script: | - darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) --latest-location +stages: +- stage: PVR_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: Validation Channel + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Add Assets Location + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' + /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:Configuration=Release + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + + +- stage: PVR_PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Gather Drop + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) + variables: + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - group: Publish-Build-Assets + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Setup Darc CLI + inputs: + targetType: filePath + filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' + + - task: PowerShell@2 + displayName: Run Darc gather-drop + inputs: + targetType: inline + script: | + darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) --latest-location + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 23876e7eb60..82834673520 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,18 +1,18 @@ -variables: - # .NET Core 3 Dev - PublicDevRelease_30_Channel_Id: 3 - - # .NET Tools - Validation - PublicValidationRelease_30_Channel_Id: 9 - - # .NET Core 3.0 Internal Servicing - InternalServicing_30_Channel_Id: 184 - - # .NET Core 3.0 Release - PublicRelease_30_Channel_Id: 19 - - # Whether the build is internal or not - IsInternalBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - - SourceLinkCLIVersion: 3.0.0 - SymbolToolVersion: 1.0.1 +variables: + # .NET Core 3 Dev + PublicDevRelease_30_Channel_Id: 3 + + # .NET Tools - Validation + PublicValidationRelease_30_Channel_Id: 9 + + # .NET Core 3.0 Internal Servicing + InternalServicing_30_Channel_Id: 184 + + # .NET Core 3.0 Release + PublicRelease_30_Channel_Id: 19 + + # Whether the build is internal or not + IsInternalBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + SourceLinkCLIVersion: 3.0.0 + SymbolToolVersion: 1.0.1 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e79936dccda..daa799259c7 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,71 +1,91 @@ -parameters: - enableSourceLinkValidation: true - enableSigningValidation: true - enableSymbolValidation: true - SDLValidationParameters: - enable: false - params: '' - -stages: -- stage: validate - dependsOn: build - displayName: Validate - jobs: - - ${{ if eq(parameters.enableSigningValidation, 'true') }}: - - job: - displayName: Signing Validation - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine dotnet - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:Configuration=Release - - - ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}: - - job: - displayName: SourceLink Validation - variables: - - template: common-variables.yml - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - - - ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}: - - template: /eng/common/templates/job/execute-sdl.yml - parameters: - additionalParameters: ${{ parameters.SDLValidationParameters.params }} - -- template: \eng\common\templates\post-build\channels\public-dev-release.yml - parameters: - enableSymbolValidation: ${{ parameters.enableSymbolValidation }} - -- template: \eng\common\templates\post-build\channels\public-validation-release.yml - -- template: \eng\common\templates\post-build\channels\public-release.yml - -- template: \eng\common\templates\post-build\channels\internal-servicing.yml +parameters: + enableSourceLinkValidation: true + enableSigningValidation: true + enableSymbolValidation: true + enableNugetValidation: true + SDLValidationParameters: + enable: false + params: '' + +stages: +- stage: validate + dependsOn: build + displayName: Validate + jobs: + - ${{ if eq(parameters.enableNugetValidation, 'true') }}: + - job: + displayName: NuGet Validation + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - ${{ if eq(parameters.enableSigningValidation, 'true') }}: + - job: + displayName: Signing Validation + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine dotnet + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:Configuration=Release + + - ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}: + - job: + displayName: SourceLink Validation + variables: + - template: common-variables.yml + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + + - ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}: + - template: /eng/common/templates/job/execute-sdl.yml + parameters: + additionalParameters: ${{ parameters.SDLValidationParameters.params }} + +- template: \eng\common\templates\post-build\channels\public-dev-release.yml + parameters: + enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + +- template: \eng\common\templates\post-build\channels\public-validation-release.yml + +- template: \eng\common\templates\post-build\channels\public-release.yml + +- template: \eng\common\templates\post-build\channels\internal-servicing.yml diff --git a/eng/common/templates/post-build/promote-build.yml b/eng/common/templates/post-build/promote-build.yml index 307b3aad11d..af48b0b339e 100644 --- a/eng/common/templates/post-build/promote-build.yml +++ b/eng/common/templates/post-build/promote-build.yml @@ -1,27 +1,24 @@ -parameters: - ChannelId: 0 - -jobs: -- job: - displayName: Promote Build - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: ChannelId - value: ${{ parameters.ChannelId }} - - group: Publish-Build-Assets - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Add Build to Channel - inputs: - targetType: inline - script: | - $headers = @{ - "Accept" = "application/json" - "Authorization" = "Bearer $(MaestroAccessToken)" - } - Invoke-RestMethod -Method Post -Headers $headers -Uri https://maestro-prod.westus2.cloudapp.azure.com/api/channels/$(ChannelId)/builds/$(BARBuildId)?api-version=2019-01-16 +parameters: + ChannelId: 0 + +jobs: +- job: + displayName: Promote Build + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) + variables: + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: ChannelId + value: ${{ parameters.ChannelId }} + - group: Publish-Build-Assets + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId $(ChannelId) + -BarToken $(MaestroAccessToken) diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 40cabe5a39f..f6120dc1e1c 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -1,35 +1,35 @@ -jobs: -- job: setupMaestroVars - displayName: Setup Maestro Vars - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Release Configs - inputs: - buildType: current - artifactName: ReleaseConfigs - - - task: PowerShell@2 - name: setReleaseVars - displayName: Set Release Configs Vars - inputs: - targetType: inline - script: | - # This is needed to make Write-PipelineSetVariable works in this context - $ci = $true - - . "$(Build.SourcesDirectory)/eng/common/tools.ps1" - - $Content = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - - $BarId = $Content | Select -Index 0 - - $Channels = "" - $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } - - $IsStableBuild = $Content | Select -Index 2 - - Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId - Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" - Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild +jobs: +- job: setupMaestroVars + displayName: Setup Maestro Vars + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + script: | + # This is needed to make Write-PipelineSetVariable works in this context + $ci = $true + + . "$(Build.SourcesDirectory)/eng/common/tools.ps1" + + $Content = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + + $BarId = $Content | Select -Index 0 + + $Channels = "" + $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } + + $IsStableBuild = $Content | Select -Index 2 + + Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId + Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" + Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml new file mode 100644 index 00000000000..65259d4e685 --- /dev/null +++ b/eng/common/templates/post-build/trigger-subscription.yml @@ -0,0 +1,11 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -BarToken $(MaestroAccessTokenInt) \ No newline at end of file diff --git a/eng/common/templates/steps/build-reason.yml b/eng/common/templates/steps/build-reason.yml index 750b5ca1a7c..eba58109b52 100644 --- a/eng/common/templates/steps/build-reason.yml +++ b/eng/common/templates/steps/build-reason.yml @@ -1,12 +1,12 @@ -# build-reason.yml -# Description: runs steps if build.reason condition is valid. conditions is a string of valid build reasons -# to include steps (',' separated). -parameters: - conditions: '' - steps: [] - -steps: - - ${{ if and( not(startsWith(parameters.conditions, 'not')), contains(parameters.conditions, variables['build.reason'])) }}: - - ${{ parameters.steps }} - - ${{ if and( startsWith(parameters.conditions, 'not'), not(contains(parameters.conditions, variables['build.reason']))) }}: - - ${{ parameters.steps }} +# build-reason.yml +# Description: runs steps if build.reason condition is valid. conditions is a string of valid build reasons +# to include steps (',' separated). +parameters: + conditions: '' + steps: [] + +steps: + - ${{ if and( not(startsWith(parameters.conditions, 'not')), contains(parameters.conditions, variables['build.reason'])) }}: + - ${{ parameters.steps }} + - ${{ if and( startsWith(parameters.conditions, 'not'), not(contains(parameters.conditions, variables['build.reason']))) }}: + - ${{ parameters.steps }} diff --git a/eng/common/templates/steps/run-on-unix.yml b/eng/common/templates/steps/run-on-unix.yml index c322f526265..e1733814f65 100644 --- a/eng/common/templates/steps/run-on-unix.yml +++ b/eng/common/templates/steps/run-on-unix.yml @@ -1,7 +1,7 @@ -parameters: - agentOs: '' - steps: [] - -steps: -- ${{ if ne(parameters.agentOs, 'Windows_NT') }}: - - ${{ parameters.steps }} +parameters: + agentOs: '' + steps: [] + +steps: +- ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ parameters.steps }} diff --git a/eng/common/templates/steps/run-on-windows.yml b/eng/common/templates/steps/run-on-windows.yml index 2080c5d7ab7..73e7e9c275a 100644 --- a/eng/common/templates/steps/run-on-windows.yml +++ b/eng/common/templates/steps/run-on-windows.yml @@ -1,7 +1,7 @@ -parameters: - agentOs: '' - steps: [] - -steps: -- ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - - ${{ parameters.steps }} +parameters: + agentOs: '' + steps: [] + +steps: +- ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ parameters.steps }} diff --git a/eng/common/templates/steps/run-script-ifequalelse.yml b/eng/common/templates/steps/run-script-ifequalelse.yml index 2342040ec91..3d1242f5587 100644 --- a/eng/common/templates/steps/run-script-ifequalelse.yml +++ b/eng/common/templates/steps/run-script-ifequalelse.yml @@ -1,33 +1,33 @@ -parameters: - # if parameter1 equals parameter 2, run 'ifScript' command, else run 'elsescript' command - parameter1: '' - parameter2: '' - ifScript: '' - elseScript: '' - - # name of script step - name: Script - - # display name of script step - displayName: If-Equal-Else Script - - # environment - env: {} - - # conditional expression for step execution - condition: '' - -steps: -- ${{ if and(ne(parameters.ifScript, ''), eq(parameters.parameter1, parameters.parameter2)) }}: - - script: ${{ parameters.ifScript }} - name: ${{ parameters.name }} - displayName: ${{ parameters.displayName }} - env: ${{ parameters.env }} - condition: ${{ parameters.condition }} - -- ${{ if and(ne(parameters.elseScript, ''), ne(parameters.parameter1, parameters.parameter2)) }}: - - script: ${{ parameters.elseScript }} - name: ${{ parameters.name }} - displayName: ${{ parameters.displayName }} - env: ${{ parameters.env }} +parameters: + # if parameter1 equals parameter 2, run 'ifScript' command, else run 'elsescript' command + parameter1: '' + parameter2: '' + ifScript: '' + elseScript: '' + + # name of script step + name: Script + + # display name of script step + displayName: If-Equal-Else Script + + # environment + env: {} + + # conditional expression for step execution + condition: '' + +steps: +- ${{ if and(ne(parameters.ifScript, ''), eq(parameters.parameter1, parameters.parameter2)) }}: + - script: ${{ parameters.ifScript }} + name: ${{ parameters.name }} + displayName: ${{ parameters.displayName }} + env: ${{ parameters.env }} + condition: ${{ parameters.condition }} + +- ${{ if and(ne(parameters.elseScript, ''), ne(parameters.parameter1, parameters.parameter2)) }}: + - script: ${{ parameters.elseScript }} + name: ${{ parameters.name }} + displayName: ${{ parameters.displayName }} + env: ${{ parameters.env }} condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 9ae41fde17c..05df886f55f 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -1,91 +1,91 @@ -# Please remember to update the documentation if you make changes to these parameters! -parameters: - HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ - HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' - HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues - HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group - HelixConfiguration: '' # optional -- additional property attached to a job - HelixPreCommands: '' # optional -- commands to run before Helix work item execution - HelixPostCommands: '' # optional -- commands to run after Helix work item execution - WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects - WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects - WorkItemTimeout: '' # optional -- a timeout in seconds for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects - CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload - XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true - XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects - XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects - XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner - XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects - IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json - EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control - WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." - IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set - Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO - condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() - continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false - -steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' - displayName: ${{ parameters.DisplayNamePrefix }} (Windows) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} (Unix) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in seconds for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json + EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates/steps/telemetry-end.yml b/eng/common/templates/steps/telemetry-end.yml index 2cc9e48fcb6..fadc04ca1b9 100644 --- a/eng/common/templates/steps/telemetry-end.yml +++ b/eng/common/templates/steps/telemetry-end.yml @@ -1,102 +1,102 @@ -parameters: - maxRetries: 5 - retryDelay: 10 # in seconds - -steps: -- bash: | - if [ "$AGENT_JOBSTATUS" = "Succeeded" ] || [ "$AGENT_JOBSTATUS" = "PartiallySucceeded" ]; then - errorCount=0 - else - errorCount=1 - fi - warningCount=0 - - curlStatus=1 - retryCount=0 - # retry loop to harden against spotty telemetry connections - # we don't retry successes and 4xx client errors - until [[ $curlStatus -eq 0 || ( $curlStatus -ge 400 && $curlStatus -le 499 ) || $retryCount -ge $MaxRetries ]] - do - if [ $retryCount -gt 0 ]; then - echo "Failed to send telemetry to Helix; waiting $RetryDelay seconds before retrying..." - sleep $RetryDelay - fi - - # create a temporary file for curl output - res=`mktemp` - - curlResult=` - curl --verbose --output $res --write-out "%{http_code}"\ - -H 'Content-Type: application/json' \ - -H "X-Helix-Job-Token: $Helix_JobToken" \ - -H 'Content-Length: 0' \ - -X POST -G "https://helix.dot.net/api/2018-03-14/telemetry/job/build/$Helix_WorkItemId/finish" \ - --data-urlencode "errorCount=$errorCount" \ - --data-urlencode "warningCount=$warningCount"` - curlStatus=$? - - if [ $curlStatus -eq 0 ]; then - if [ $curlResult -gt 299 ] || [ $curlResult -lt 200 ]; then - curlStatus=$curlResult - fi - fi - - let retryCount++ - done - - if [ $curlStatus -ne 0 ]; then - echo "Failed to Send Build Finish information after $retryCount retries" - vstsLogOutput="vso[task.logissue type=error;sourcepath=templates/steps/telemetry-end.yml;code=1;]Failed to Send Build Finish information: $curlStatus" - echo "##$vstsLogOutput" - exit 1 - fi - displayName: Send Unix Build End Telemetry - env: - # defined via VSTS variables in start-job.sh - Helix_JobToken: $(Helix_JobToken) - Helix_WorkItemId: $(Helix_WorkItemId) - MaxRetries: ${{ parameters.maxRetries }} - RetryDelay: ${{ parameters.retryDelay }} - condition: and(always(), ne(variables['Agent.Os'], 'Windows_NT')) -- powershell: | - if (($env:Agent_JobStatus -eq 'Succeeded') -or ($env:Agent_JobStatus -eq 'PartiallySucceeded')) { - $ErrorCount = 0 - } else { - $ErrorCount = 1 - } - $WarningCount = 0 - - # Basic retry loop to harden against server flakiness - $retryCount = 0 - while ($retryCount -lt $env:MaxRetries) { - try { - Invoke-RestMethod -Uri "https://helix.dot.net/api/2018-03-14/telemetry/job/build/$env:Helix_WorkItemId/finish?errorCount=$ErrorCount&warningCount=$WarningCount" -Method Post -ContentType "application/json" -Body "" ` - -Headers @{ 'X-Helix-Job-Token'=$env:Helix_JobToken } - break - } - catch { - $statusCode = $_.Exception.Response.StatusCode.value__ - if ($statusCode -ge 400 -and $statusCode -le 499) { - Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix (status code $statusCode); not retrying (4xx client error)" - Write-Host "##vso[task.logissue]error ", $_.Exception.GetType().FullName, $_.Exception.Message - exit 1 - } - Write-Host "Failed to send telemetry to Helix (status code $statusCode); waiting $env:RetryDelay seconds before retrying..." - $retryCount++ - sleep $env:RetryDelay - continue - } - } - - if ($retryCount -ge $env:MaxRetries) { - Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix after $retryCount retries." - exit 1 - } - displayName: Send Windows Build End Telemetry - env: - # defined via VSTS variables in start-job.ps1 - Helix_JobToken: $(Helix_JobToken) - Helix_WorkItemId: $(Helix_WorkItemId) - MaxRetries: ${{ parameters.maxRetries }} - RetryDelay: ${{ parameters.retryDelay }} - condition: and(always(),eq(variables['Agent.Os'], 'Windows_NT')) +parameters: + maxRetries: 5 + retryDelay: 10 # in seconds + +steps: +- bash: | + if [ "$AGENT_JOBSTATUS" = "Succeeded" ] || [ "$AGENT_JOBSTATUS" = "PartiallySucceeded" ]; then + errorCount=0 + else + errorCount=1 + fi + warningCount=0 + + curlStatus=1 + retryCount=0 + # retry loop to harden against spotty telemetry connections + # we don't retry successes and 4xx client errors + until [[ $curlStatus -eq 0 || ( $curlStatus -ge 400 && $curlStatus -le 499 ) || $retryCount -ge $MaxRetries ]] + do + if [ $retryCount -gt 0 ]; then + echo "Failed to send telemetry to Helix; waiting $RetryDelay seconds before retrying..." + sleep $RetryDelay + fi + + # create a temporary file for curl output + res=`mktemp` + + curlResult=` + curl --verbose --output $res --write-out "%{http_code}"\ + -H 'Content-Type: application/json' \ + -H "X-Helix-Job-Token: $Helix_JobToken" \ + -H 'Content-Length: 0' \ + -X POST -G "https://helix.dot.net/api/2018-03-14/telemetry/job/build/$Helix_WorkItemId/finish" \ + --data-urlencode "errorCount=$errorCount" \ + --data-urlencode "warningCount=$warningCount"` + curlStatus=$? + + if [ $curlStatus -eq 0 ]; then + if [ $curlResult -gt 299 ] || [ $curlResult -lt 200 ]; then + curlStatus=$curlResult + fi + fi + + let retryCount++ + done + + if [ $curlStatus -ne 0 ]; then + echo "Failed to Send Build Finish information after $retryCount retries" + vstsLogOutput="vso[task.logissue type=error;sourcepath=templates/steps/telemetry-end.yml;code=1;]Failed to Send Build Finish information: $curlStatus" + echo "##$vstsLogOutput" + exit 1 + fi + displayName: Send Unix Build End Telemetry + env: + # defined via VSTS variables in start-job.sh + Helix_JobToken: $(Helix_JobToken) + Helix_WorkItemId: $(Helix_WorkItemId) + MaxRetries: ${{ parameters.maxRetries }} + RetryDelay: ${{ parameters.retryDelay }} + condition: and(always(), ne(variables['Agent.Os'], 'Windows_NT')) +- powershell: | + if (($env:Agent_JobStatus -eq 'Succeeded') -or ($env:Agent_JobStatus -eq 'PartiallySucceeded')) { + $ErrorCount = 0 + } else { + $ErrorCount = 1 + } + $WarningCount = 0 + + # Basic retry loop to harden against server flakiness + $retryCount = 0 + while ($retryCount -lt $env:MaxRetries) { + try { + Invoke-RestMethod -Uri "https://helix.dot.net/api/2018-03-14/telemetry/job/build/$env:Helix_WorkItemId/finish?errorCount=$ErrorCount&warningCount=$WarningCount" -Method Post -ContentType "application/json" -Body "" ` + -Headers @{ 'X-Helix-Job-Token'=$env:Helix_JobToken } + break + } + catch { + $statusCode = $_.Exception.Response.StatusCode.value__ + if ($statusCode -ge 400 -and $statusCode -le 499) { + Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix (status code $statusCode); not retrying (4xx client error)" + Write-Host "##vso[task.logissue]error ", $_.Exception.GetType().FullName, $_.Exception.Message + exit 1 + } + Write-Host "Failed to send telemetry to Helix (status code $statusCode); waiting $env:RetryDelay seconds before retrying..." + $retryCount++ + sleep $env:RetryDelay + continue + } + } + + if ($retryCount -ge $env:MaxRetries) { + Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix after $retryCount retries." + exit 1 + } + displayName: Send Windows Build End Telemetry + env: + # defined via VSTS variables in start-job.ps1 + Helix_JobToken: $(Helix_JobToken) + Helix_WorkItemId: $(Helix_WorkItemId) + MaxRetries: ${{ parameters.maxRetries }} + RetryDelay: ${{ parameters.retryDelay }} + condition: and(always(),eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml index 9bae2af5a22..32c01ef0b55 100644 --- a/eng/common/templates/steps/telemetry-start.yml +++ b/eng/common/templates/steps/telemetry-start.yml @@ -1,241 +1,241 @@ -parameters: - helixSource: 'undefined_defaulted_in_telemetry.yml' - helixType: 'undefined_defaulted_in_telemetry.yml' - buildConfig: '' - runAsPublic: false - maxRetries: 5 - retryDelay: 10 # in seconds - -steps: -- ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}: - - task: AzureKeyVault@1 - inputs: - azureSubscription: 'HelixProd_KeyVault' - KeyVaultName: HelixProdKV - SecretsFilter: 'HelixApiAccessToken' - condition: always() -- bash: | - # create a temporary file - jobInfo=`mktemp` - - # write job info content to temporary file - cat > $jobInfo < $jobInfo <' | Set-Content $proj - - MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile - - $path = Get-Content $toolsetLocationFile -TotalCount 1 - if (!(Test-Path $path)) { - throw "Invalid toolset path: $path" - } - - return $global:_ToolsetBuildProj = $path -} - -function ExitWithExitCode([int] $exitCode) { - if ($ci -and $prepareMachine) { - Stop-Processes - } - exit $exitCode -} - -function Stop-Processes() { - Write-Host "Killing running build processes..." - foreach ($processName in $processesToStopOnExit) { - Get-Process -Name $processName -ErrorAction SilentlyContinue | Stop-Process - } -} - -# -# Executes msbuild (or 'dotnet msbuild') with arguments passed to the function. -# The arguments are automatically quoted. -# Terminates the script if the build fails. -# -function MSBuild() { - if ($pipelinesLog) { - $buildTool = InitializeBuildTool - $toolsetBuildProject = InitializeToolset - $path = Split-Path -parent $toolsetBuildProject - $path = Join-Path $path (Join-Path $buildTool.Framework "Microsoft.DotNet.Arcade.Sdk.dll") - $args += "/logger:$path" - } - - MSBuild-Core @args -} - -# -# Executes msbuild (or 'dotnet msbuild') with arguments passed to the function. -# The arguments are automatically quoted. -# Terminates the script if the build fails. -# -function MSBuild-Core() { - if ($ci) { - if (!$binaryLog) { - Write-PipelineTaskError -Message "Binary log must be enabled in CI build." - ExitWithExitCode 1 - } - - if ($nodeReuse) { - Write-PipelineTaskError -Message "Node reuse must be disabled in CI build." - ExitWithExitCode 1 - } - } - - $buildTool = InitializeBuildTool - - $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" - - if ($warnAsError) { - $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" - } - - foreach ($arg in $args) { - if ($arg -ne $null -and $arg.Trim() -ne "") { - $cmdArgs += " `"$arg`"" - } - } - - $exitCode = Exec-Process $buildTool.Path $cmdArgs - - if ($exitCode -ne 0) { - Write-PipelineTaskError -Message "Build failed." - - $buildLog = GetMSBuildBinaryLogCommandLineArgument $args - if ($buildLog -ne $null) { - Write-Host "See log: $buildLog" -ForegroundColor DarkGray - } - - ExitWithExitCode $exitCode - } -} - -function GetMSBuildBinaryLogCommandLineArgument($arguments) { - foreach ($argument in $arguments) { - if ($argument -ne $null) { - $arg = $argument.Trim() - if ($arg.StartsWith("/bl:", "OrdinalIgnoreCase")) { - return $arg.Substring("/bl:".Length) - } - - if ($arg.StartsWith("/binaryLogger:", "OrdinalIgnoreCase")) { - return $arg.Substring("/binaryLogger:".Length) - } - } - } - - return $null -} - -. $PSScriptRoot\pipeline-logging-functions.ps1 - -$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") -$EngRoot = Resolve-Path (Join-Path $PSScriptRoot "..") -$ArtifactsDir = Join-Path $RepoRoot "artifacts" -$ToolsetDir = Join-Path $ArtifactsDir "toolset" -$ToolsDir = Join-Path $RepoRoot ".tools" -$LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration -$TempDir = Join-Path (Join-Path $ArtifactsDir "tmp") $configuration -$GlobalJson = Get-Content -Raw -Path (Join-Path $RepoRoot "global.json") | ConvertFrom-Json -# true if global.json contains a "runtimes" section -$globalJsonHasRuntimes = if ($GlobalJson.tools.PSObject.Properties.Name -Match 'runtimes') { $true } else { $false } - -Create-Directory $ToolsetDir -Create-Directory $TempDir -Create-Directory $LogDir - -Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir -Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir -Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir -Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir -Write-PipelineSetVariable -Name 'TMP' -Value $TempDir +# Initialize variables if they aren't already defined. +# These may be defined as parameters of the importing script, or set after importing this script. + +# CI mode - set to true on CI server for PR validation build or official build. +[bool]$ci = if (Test-Path variable:ci) { $ci } else { $false } + +# Build configuration. Common values include 'Debug' and 'Release', but the repository may use other names. +[string]$configuration = if (Test-Path variable:configuration) { $configuration } else { "Debug" } + +# Set to true to output binary log from msbuild. Note that emitting binary log slows down the build. +# Binary log must be enabled on CI. +[bool]$binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $ci } + +# Set to true to use the pipelines logger which will enable Azure logging output. +# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md +# This flag is meant as a temporary opt-opt for the feature while validate it across +# our consumers. It will be deleted in the future. +[bool]$pipelinesLog = if (Test-Path variable:pipelinesLog) { $pipelinesLog } else { $ci } + +# Turns on machine preparation/clean up code that changes the machine state (e.g. kills build processes). +[bool]$prepareMachine = if (Test-Path variable:prepareMachine) { $prepareMachine } else { $false } + +# True to restore toolsets and dependencies. +[bool]$restore = if (Test-Path variable:restore) { $restore } else { $true } + +# Adjusts msbuild verbosity level. +[string]$verbosity = if (Test-Path variable:verbosity) { $verbosity } else { "minimal" } + +# Set to true to reuse msbuild nodes. Recommended to not reuse on CI. +[bool]$nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { !$ci } + +# Configures warning treatment in msbuild. +[bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true } + +# Specifies which msbuild engine to use for build: 'vs', 'dotnet' or unspecified (determined based on presence of tools.vs in global.json). +[string]$msbuildEngine = if (Test-Path variable:msbuildEngine) { $msbuildEngine } else { $null } + +# True to attempt using .NET Core already that meets requirements specified in global.json +# installed on the machine instead of downloading one. +[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } + +# True to use global NuGet cache instead of restoring packages to repository-local directory. +[bool]$useGlobalNuGetCache = if (Test-Path variable:useGlobalNuGetCache) { $useGlobalNuGetCache } else { !$ci } + +# An array of names of processes to stop on script exit if prepareMachine is true. +$processesToStopOnExit = if (Test-Path variable:processesToStopOnExit) { $processesToStopOnExit } else { @("msbuild", "dotnet", "vbcscompiler") } + +set-strictmode -version 2.0 +$ErrorActionPreference = "Stop" +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +function Create-Directory([string[]] $path) { + if (!(Test-Path $path)) { + New-Item -path $path -force -itemType "Directory" | Out-Null + } +} + +function Unzip([string]$zipfile, [string]$outpath) { + Add-Type -AssemblyName System.IO.Compression.FileSystem + [System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath) +} + +# This will exec a process using the console and return it's exit code. +# This will not throw when the process fails. +# Returns process exit code. +function Exec-Process([string]$command, [string]$commandArgs) { + $startInfo = New-Object System.Diagnostics.ProcessStartInfo + $startInfo.FileName = $command + $startInfo.Arguments = $commandArgs + $startInfo.UseShellExecute = $false + $startInfo.WorkingDirectory = Get-Location + + $process = New-Object System.Diagnostics.Process + $process.StartInfo = $startInfo + $process.Start() | Out-Null + + $finished = $false + try { + while (-not $process.WaitForExit(100)) { + # Non-blocking loop done to allow ctr-c interrupts + } + + $finished = $true + return $global:LASTEXITCODE = $process.ExitCode + } + finally { + # If we didn't finish then an error occured or the user hit ctrl-c. Either + # way kill the process + if (-not $finished) { + $process.Kill() + } + } +} + +function InitializeDotNetCli([bool]$install) { + if (Test-Path variable:global:_DotNetInstallDir) { + return $global:_DotNetInstallDir + } + + # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism + $env:DOTNET_MULTILEVEL_LOOKUP=0 + + # Disable first run since we do not need all ASP.NET packages restored. + $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + # Disable telemetry on CI. + if ($ci) { + $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 + } + + # Source Build uses DotNetCoreSdkDir variable + if ($env:DotNetCoreSdkDir -ne $null) { + $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir + } + + # Find the first path on %PATH% that contains the dotnet.exe + if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { + $dotnetCmd = Get-Command "dotnet.exe" -ErrorAction SilentlyContinue + if ($dotnetCmd -ne $null) { + $env:DOTNET_INSTALL_DIR = Split-Path $dotnetCmd.Path -Parent + } + } + + $dotnetSdkVersion = $GlobalJson.tools.dotnet + + # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version, + # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues. + if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { + $dotnetRoot = $env:DOTNET_INSTALL_DIR + } else { + $dotnetRoot = Join-Path $RepoRoot ".dotnet" + + if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) { + if ($install) { + InstallDotNetSdk $dotnetRoot $dotnetSdkVersion + } else { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Unable to find dotnet with SDK version '$dotnetSdkVersion'" + ExitWithExitCode 1 + } + } + + $env:DOTNET_INSTALL_DIR = $dotnetRoot + } + + # Add dotnet to PATH. This prevents any bare invocation of dotnet in custom + # build steps from using anything other than what we've downloaded. + # It also ensures that VS msbuild will use the downloaded sdk targets. + $env:PATH = "$dotnetRoot;$env:PATH" + + # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build + Write-PipelinePrependPath -Path $dotnetRoot + Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' + Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + + return $global:_DotNetInstallDir = $dotnetRoot +} + +function GetDotNetInstallScript([string] $dotnetRoot) { + $installScript = Join-Path $dotnetRoot "dotnet-install.ps1" + if (!(Test-Path $installScript)) { + Create-Directory $dotnetRoot + Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile $installScript + } + + return $installScript +} + +function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "") { + InstallDotNet $dotnetRoot $version $architecture +} + +function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { $installScript = GetDotNetInstallScript $dotnetRoot + $installScript = GetDotNetInstallScript $dotnetRoot + $installParameters = @{ + Version = $version + InstallDir = $dotnetRoot + } + + if ($architecture) { $installParameters.Architecture = $architecture } + if ($runtime) { $installParameters.Runtime = $runtime } + if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } + + & $installScript @installParameters + if ($lastExitCode -ne 0) { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." + ExitWithExitCode $lastExitCode + } +} + +# +# Locates Visual Studio MSBuild installation. +# The preference order for MSBuild to use is as follows: +# +# 1. MSBuild from an active VS command prompt +# 2. MSBuild from a compatible VS installation +# 3. MSBuild from the xcopy tool package +# +# Returns full path to msbuild.exe. +# Throws on failure. +# +function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $null) { + if (Test-Path variable:global:_MSBuildExe) { + return $global:_MSBuildExe + } + + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { "15.9" } + $vsMinVersion = [Version]::new($vsMinVersionStr) + + # Try msbuild command available in the environment. + if ($env:VSINSTALLDIR -ne $null) { + $msbuildCmd = Get-Command "msbuild.exe" -ErrorAction SilentlyContinue + if ($msbuildCmd -ne $null) { + # Workaround for https://github.com/dotnet/roslyn/issues/35793 + # Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+ + $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split(@('-', '+'))[0]) + + if ($msbuildVersion -ge $vsMinVersion) { + return $global:_MSBuildExe = $msbuildCmd.Path + } + + # Report error - the developer environment is initialized with incompatible VS version. + throw "Developer Command Prompt for VS $($env:VisualStudioVersion) is not recent enough. Please upgrade to $vsMinVersionStr or build from a plain CMD window" + } + } + + # Locate Visual Studio installation or download x-copy msbuild. + $vsInfo = LocateVisualStudio $vsRequirements + if ($vsInfo -ne $null) { + $vsInstallDir = $vsInfo.installationPath + $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] + + InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion + } else { + + if (Get-Member -InputObject $GlobalJson.tools -Name "xcopy-msbuild") { + $xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild' + $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0] + } else { + $vsMajorVersion = $vsMinVersion.Major + $xcopyMSBuildVersion = "$vsMajorVersion.$($vsMinVersion.Minor).0-alpha" + } + + $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install + if ($vsInstallDir -eq $null) { + throw "Unable to find Visual Studio that has required version and components installed" + } + } + + $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } + return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" +} + +function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { + $env:VSINSTALLDIR = $vsInstallDir + Set-Item "env:VS$($vsMajorVersion)0COMNTOOLS" (Join-Path $vsInstallDir "Common7\Tools\") + + $vsSdkInstallDir = Join-Path $vsInstallDir "VSSDK\" + if (Test-Path $vsSdkInstallDir) { + Set-Item "env:VSSDK$($vsMajorVersion)0Install" $vsSdkInstallDir + $env:VSSDKInstall = $vsSdkInstallDir + } +} + +function InstallXCopyMSBuild([string]$packageVersion) { + return InitializeXCopyMSBuild $packageVersion -install $true +} + +function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { + $packageName = "RoslynTools.MSBuild" + $packageDir = Join-Path $ToolsDir "msbuild\$packageVersion" + $packagePath = Join-Path $packageDir "$packageName.$packageVersion.nupkg" + + if (!(Test-Path $packageDir)) { + if (!$install) { + return $null + } + + Create-Directory $packageDir + Write-Host "Downloading $packageName $packageVersion" + Invoke-WebRequest "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/$packageName/$packageVersion/" -OutFile $packagePath + Unzip $packagePath $packageDir + } + + return Join-Path $packageDir "tools" +} + +# +# Locates Visual Studio instance that meets the minimal requirements specified by tools.vs object in global.json. +# +# The following properties of tools.vs are recognized: +# "version": "{major}.{minor}" +# Two part minimal VS version, e.g. "15.9", "16.0", etc. +# "components": ["componentId1", "componentId2", ...] +# Array of ids of workload components that must be available in the VS instance. +# See e.g. https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise?view=vs-2017 +# +# Returns JSON describing the located VS instance (same format as returned by vswhere), +# or $null if no instance meeting the requirements is found on the machine. +# +function LocateVisualStudio([object]$vsRequirements = $null){ + if (Get-Member -InputObject $GlobalJson.tools -Name "vswhere") { + $vswhereVersion = $GlobalJson.tools.vswhere + } else { + $vswhereVersion = "2.5.2" + } + + $vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion" + $vsWhereExe = Join-Path $vsWhereDir "vswhere.exe" + + if (!(Test-Path $vsWhereExe)) { + Create-Directory $vsWhereDir + Write-Host "Downloading vswhere" + Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + } + + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + $args = @("-latest", "-prerelease", "-format", "json", "-requires", "Microsoft.Component.MSBuild", "-products", "*") + + if (Get-Member -InputObject $vsRequirements -Name "version") { + $args += "-version" + $args += $vsRequirements.version + } + + if (Get-Member -InputObject $vsRequirements -Name "components") { + foreach ($component in $vsRequirements.components) { + $args += "-requires" + $args += $component + } + } + + $vsInfo =& $vsWhereExe $args | ConvertFrom-Json + + if ($lastExitCode -ne 0) { + return $null + } + + # use first matching instance + return $vsInfo[0] +} + +function InitializeBuildTool() { + if (Test-Path variable:global:_BuildTool) { + return $global:_BuildTool + } + + if (-not $msbuildEngine) { + $msbuildEngine = GetDefaultMSBuildEngine + } + + # Initialize dotnet cli if listed in 'tools' + $dotnetRoot = $null + if (Get-Member -InputObject $GlobalJson.tools -Name "dotnet") { + $dotnetRoot = InitializeDotNetCli -install:$restore + } + + if ($msbuildEngine -eq "dotnet") { + if (!$dotnetRoot) { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "/global.json must specify 'tools.dotnet'." + ExitWithExitCode 1 + } + + $buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" } + } elseif ($msbuildEngine -eq "vs") { + try { + $msbuildPath = InitializeVisualStudioMSBuild -install:$restore + } catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message $_ + ExitWithExitCode 1 + } + + $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" } + } else { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'." + ExitWithExitCode 1 + } + + return $global:_BuildTool = $buildTool +} + +function GetDefaultMSBuildEngine() { + # Presence of tools.vs indicates the repo needs to build using VS msbuild on Windows. + if (Get-Member -InputObject $GlobalJson.tools -Name "vs") { + return "vs" + } + + if (Get-Member -InputObject $GlobalJson.tools -Name "dotnet") { + return "dotnet" + } + + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "-msbuildEngine must be specified, or /global.json must specify 'tools.dotnet' or 'tools.vs'." + ExitWithExitCode 1 +} + +function GetNuGetPackageCachePath() { + if ($env:NUGET_PACKAGES -eq $null) { + # Use local cache on CI to ensure deterministic build, + # use global cache in dev builds to avoid cost of downloading packages. + if ($useGlobalNuGetCache) { + $env:NUGET_PACKAGES = Join-Path $env:UserProfile ".nuget\packages" + } else { + $env:NUGET_PACKAGES = Join-Path $RepoRoot ".packages" + } + } + + return $env:NUGET_PACKAGES +} + +# Returns a full path to an Arcade SDK task project file. +function GetSdkTaskProject([string]$taskName) { + return Join-Path (Split-Path (InitializeToolset) -Parent) "SdkTasks\$taskName.proj" +} + +function InitializeNativeTools() { + if (Get-Member -InputObject $GlobalJson -Name "native-tools") { + $nativeArgs= @{} + if ($ci) { + $nativeArgs = @{ + InstallDirectory = "$ToolsDir" + } + } + & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs + } +} + +function InitializeToolset() { + if (Test-Path variable:global:_ToolsetBuildProj) { + return $global:_ToolsetBuildProj + } + + $nugetCache = GetNuGetPackageCachePath + + $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk' + $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt" + + if (Test-Path $toolsetLocationFile) { + $path = Get-Content $toolsetLocationFile -TotalCount 1 + if (Test-Path $path) { + return $global:_ToolsetBuildProj = $path + } + } + + if (-not $restore) { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Toolset version $toolsetVersion has not been restored." + ExitWithExitCode 1 + } + + $buildTool = InitializeBuildTool + + $proj = Join-Path $ToolsetDir "restore.proj" + $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" } + + '' | Set-Content $proj + + MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile + + $path = Get-Content $toolsetLocationFile -TotalCount 1 + if (!(Test-Path $path)) { + throw "Invalid toolset path: $path" + } + + return $global:_ToolsetBuildProj = $path +} + +function ExitWithExitCode([int] $exitCode) { + if ($ci -and $prepareMachine) { + Stop-Processes + } + exit $exitCode +} + +function Stop-Processes() { + Write-Host "Killing running build processes..." + foreach ($processName in $processesToStopOnExit) { + Get-Process -Name $processName -ErrorAction SilentlyContinue | Stop-Process + } +} + +# +# Executes msbuild (or 'dotnet msbuild') with arguments passed to the function. +# The arguments are automatically quoted. +# Terminates the script if the build fails. +# +function MSBuild() { + if ($pipelinesLog) { + $buildTool = InitializeBuildTool + $toolsetBuildProject = InitializeToolset + $path = Split-Path -parent $toolsetBuildProject + $path = Join-Path $path (Join-Path $buildTool.Framework "Microsoft.DotNet.Arcade.Sdk.dll") + $args += "/logger:$path" + } + + MSBuild-Core @args +} + +# +# Executes msbuild (or 'dotnet msbuild') with arguments passed to the function. +# The arguments are automatically quoted. +# Terminates the script if the build fails. +# +function MSBuild-Core() { + if ($ci) { + if (!$binaryLog) { + Write-PipelineTaskError -Message "Binary log must be enabled in CI build." + ExitWithExitCode 1 + } + + if ($nodeReuse) { + Write-PipelineTaskError -Message "Node reuse must be disabled in CI build." + ExitWithExitCode 1 + } + } + + $buildTool = InitializeBuildTool + + $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" + + if ($warnAsError) { + $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" + } + + foreach ($arg in $args) { + if ($arg -ne $null -and $arg.Trim() -ne "") { + $cmdArgs += " `"$arg`"" + } + } + + $exitCode = Exec-Process $buildTool.Path $cmdArgs + + if ($exitCode -ne 0) { + Write-PipelineTaskError -Message "Build failed." + + $buildLog = GetMSBuildBinaryLogCommandLineArgument $args + if ($buildLog -ne $null) { + Write-Host "See log: $buildLog" -ForegroundColor DarkGray + } + + ExitWithExitCode $exitCode + } +} + +function GetMSBuildBinaryLogCommandLineArgument($arguments) { + foreach ($argument in $arguments) { + if ($argument -ne $null) { + $arg = $argument.Trim() + if ($arg.StartsWith("/bl:", "OrdinalIgnoreCase")) { + return $arg.Substring("/bl:".Length) + } + + if ($arg.StartsWith("/binaryLogger:", "OrdinalIgnoreCase")) { + return $arg.Substring("/binaryLogger:".Length) + } + } + } + + return $null +} + +. $PSScriptRoot\pipeline-logging-functions.ps1 + +$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") +$EngRoot = Resolve-Path (Join-Path $PSScriptRoot "..") +$ArtifactsDir = Join-Path $RepoRoot "artifacts" +$ToolsetDir = Join-Path $ArtifactsDir "toolset" +$ToolsDir = Join-Path $RepoRoot ".tools" +$LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration +$TempDir = Join-Path (Join-Path $ArtifactsDir "tmp") $configuration +$GlobalJson = Get-Content -Raw -Path (Join-Path $RepoRoot "global.json") | ConvertFrom-Json +# true if global.json contains a "runtimes" section +$globalJsonHasRuntimes = if ($GlobalJson.tools.PSObject.Properties.Name -Match 'runtimes') { $true } else { $false } + +Create-Directory $ToolsetDir +Create-Directory $TempDir +Create-Directory $LogDir + +Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir +Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir +Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir +Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir +Write-PipelineSetVariable -Name 'TMP' -Value $TempDir diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3e06ea3d04b..70d92cf85aa 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -1,393 +1,393 @@ -#!/usr/bin/env bash - -# Initialize variables if they aren't already defined. - -# CI mode - set to true on CI server for PR validation build or official build. -ci=${ci:-false} - -# Set to true to use the pipelines logger which will enable Azure logging output. -# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md -# This flag is meant as a temporary opt-opt for the feature while validate it across -# our consumers. It will be deleted in the future. -if [[ "$ci" == true ]]; then - pipelines_log=${pipelines_log:-true} -else - pipelines_log=${pipelines_log:-false} -fi - -# Build configuration. Common values include 'Debug' and 'Release', but the repository may use other names. -configuration=${configuration:-'Debug'} - -# Set to true to output binary log from msbuild. Note that emitting binary log slows down the build. -# Binary log must be enabled on CI. -binary_log=${binary_log:-$ci} - -# Turns on machine preparation/clean up code that changes the machine state (e.g. kills build processes). -prepare_machine=${prepare_machine:-false} - -# True to restore toolsets and dependencies. -restore=${restore:-true} - -# Adjusts msbuild verbosity level. -verbosity=${verbosity:-'minimal'} - -# Set to true to reuse msbuild nodes. Recommended to not reuse on CI. -if [[ "$ci" == true ]]; then - node_reuse=${node_reuse:-false} -else - node_reuse=${node_reuse:-true} -fi - -# Configures warning treatment in msbuild. -warn_as_error=${warn_as_error:-true} - -# True to attempt using .NET Core already that meets requirements specified in global.json -# installed on the machine instead of downloading one. -use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} - -# True to use global NuGet cache instead of restoring packages to repository-local directory. -if [[ "$ci" == true ]]; then - use_global_nuget_cache=${use_global_nuget_cache:-false} -else - use_global_nuget_cache=${use_global_nuget_cache:-true} -fi - -# Resolve any symlinks in the given path. -function ResolvePath { - local path=$1 - - while [[ -h $path ]]; do - local dir="$( cd -P "$( dirname "$path" )" && pwd )" - path="$(readlink "$path")" - - # if $path was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $path != /* ]] && path="$dir/$path" - done - - # return value - _ResolvePath="$path" -} - -# ReadVersionFromJson [json key] -function ReadGlobalVersion { - local key=$1 - - local line=`grep -m 1 "$key" "$global_json_file"` - local pattern="\"$key\" *: *\"(.*)\"" - - if [[ ! $line =~ $pattern ]]; then - Write-PipelineTelemetryError -category 'InitializeTools' "Error: Cannot find \"$key\" in $global_json_file" - ExitWithExitCode 1 - fi - - # return value - _ReadGlobalVersion=${BASH_REMATCH[1]} -} - -function InitializeDotNetCli { - if [[ -n "${_InitializeDotNetCli:-}" ]]; then - return - fi - - local install=$1 - - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - export DOTNET_MULTILEVEL_LOOKUP=0 - - # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - - # Disable telemetry on CI - if [[ $ci == true ]]; then - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - fi - - # LTTNG is the logging infrastructure used by Core CLR. Need this variable set - # so it doesn't output warnings to the console. - export LTTNG_HOME="$HOME" - - # Source Build uses DotNetCoreSdkDir variable - if [[ -n "${DotNetCoreSdkDir:-}" ]]; then - export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir" - fi - - # Find the first path on $PATH that contains the dotnet.exe - if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then - local dotnet_path=`command -v dotnet` - if [[ -n "$dotnet_path" ]]; then - ResolvePath "$dotnet_path" - export DOTNET_INSTALL_DIR=`dirname "$_ResolvePath"` - fi - fi - - ReadGlobalVersion "dotnet" - local dotnet_sdk_version=$_ReadGlobalVersion - local dotnet_root="" - - # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version, - # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues. - if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then - dotnet_root="$DOTNET_INSTALL_DIR" - else - dotnet_root="$repo_root/.dotnet" - - export DOTNET_INSTALL_DIR="$dotnet_root" - - if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then - if [[ "$install" == true ]]; then - InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" - else - Write-PipelineTelemetryError -category 'InitializeToolset' "Unable to find dotnet with SDK version '$dotnet_sdk_version'" - ExitWithExitCode 1 - fi - fi - fi - - # Add dotnet to PATH. This prevents any bare invocation of dotnet in custom - # build steps from using anything other than what we've downloaded. - export PATH="$dotnet_root:$PATH" - - if [[ $ci == true ]]; then - # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build - echo "##vso[task.prependpath]$dotnet_root" - echo "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0" - echo "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1" - fi - - # return value - _InitializeDotNetCli="$dotnet_root" -} - -function InstallDotNetSdk { - local root=$1 - local version=$2 - local architecture="" - if [[ $# == 3 ]]; then - architecture=$3 - fi - InstallDotNet "$root" "$version" $architecture -} - -function InstallDotNet { - local root=$1 - local version=$2 - - GetDotNetInstallScript "$root" - local install_script=$_GetDotNetInstallScript - - local archArg='' - if [[ -n "${3:-}" ]]; then - archArg="--architecture $3" - fi - local runtimeArg='' - if [[ -n "${4:-}" ]]; then - runtimeArg="--runtime $4" - fi - - local skipNonVersionedFilesArg="" - if [[ "$#" -ge "5" ]]; then - skipNonVersionedFilesArg="--skip-non-versioned-files" - fi - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." - ExitWithExitCode $exit_code - } -} - -function GetDotNetInstallScript { - local root=$1 - local install_script="$root/dotnet-install.sh" - local install_script_url="https://dot.net/v1/dotnet-install.sh" - - if [[ ! -a "$install_script" ]]; then - mkdir -p "$root" - - echo "Downloading '$install_script_url'" - - # Use curl if available, otherwise use wget - if command -v curl > /dev/null; then - curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" - else - wget -q -O "$install_script" "$install_script_url" - fi - fi - - # return value - _GetDotNetInstallScript="$install_script" -} - -function InitializeBuildTool { - if [[ -n "${_InitializeBuildTool:-}" ]]; then - return - fi - - InitializeDotNetCli $restore - - # return values - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" - _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="netcoreapp2.1" -} - -function GetNuGetPackageCachePath { - if [[ -z ${NUGET_PACKAGES:-} ]]; then - if [[ "$use_global_nuget_cache" == true ]]; then - export NUGET_PACKAGES="$HOME/.nuget/packages" - else - export NUGET_PACKAGES="$repo_root/.packages" - fi - fi - - # return value - _GetNuGetPackageCachePath=$NUGET_PACKAGES -} - -function InitializeNativeTools() { - if grep -Fq "native-tools" $global_json_file - then - local nativeArgs="" - if [[ "$ci" == true ]]; then - nativeArgs="-InstallDirectory $tools_dir" - fi - "$_script_dir/init-tools-native.sh" $nativeArgs - fi -} - -function InitializeToolset { - if [[ -n "${_InitializeToolset:-}" ]]; then - return - fi - - GetNuGetPackageCachePath - - ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk" - - local toolset_version=$_ReadGlobalVersion - local toolset_location_file="$toolset_dir/$toolset_version.txt" - - if [[ -a "$toolset_location_file" ]]; then - local path=`cat "$toolset_location_file"` - if [[ -a "$path" ]]; then - # return value - _InitializeToolset="$path" - return - fi - fi - - if [[ "$restore" != true ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Toolset version $toolset_version has not been restored." - ExitWithExitCode 2 - fi - - local proj="$toolset_dir/restore.proj" - - local bl="" - if [[ "$binary_log" == true ]]; then - bl="/bl:$log_dir/ToolsetRestore.binlog" - fi - - echo '' > "$proj" - MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" - - local toolset_build_proj=`cat "$toolset_location_file"` - - if [[ ! -a "$toolset_build_proj" ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Invalid toolset path: $toolset_build_proj" - ExitWithExitCode 3 - fi - - # return value - _InitializeToolset="$toolset_build_proj" -} - -function ExitWithExitCode { - if [[ "$ci" == true && "$prepare_machine" == true ]]; then - StopProcesses - fi - exit $1 -} - -function StopProcesses { - echo "Killing running build processes..." - pkill -9 "dotnet" || true - pkill -9 "vbcscompiler" || true - return 0 -} - -function MSBuild { - local args=$@ - if [[ "$pipelines_log" == true ]]; then - InitializeBuildTool - InitializeToolset - local toolset_dir="${_InitializeToolset%/*}" - local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" - args=( "${args[@]}" "-logger:$logger_path" ) - fi - - MSBuild-Core ${args[@]} -} - -function MSBuild-Core { - if [[ "$ci" == true ]]; then - if [[ "$binary_log" != true ]]; then - Write-PipelineTaskError "Binary log must be enabled in CI build." - ExitWithExitCode 1 - fi - - if [[ "$node_reuse" == true ]]; then - Write-PipelineTaskError "Node reuse must be disabled in CI build." - ExitWithExitCode 1 - fi - fi - - InitializeBuildTool - - local warnaserror_switch="" - if [[ $warn_as_error == true ]]; then - warnaserror_switch="/warnaserror" - fi - - "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || { - local exit_code=$? - Write-PipelineTaskError "Build failed (exit code '$exit_code')." - ExitWithExitCode $exit_code - } -} - -ResolvePath "${BASH_SOURCE[0]}" -_script_dir=`dirname "$_ResolvePath"` - -. "$_script_dir/pipeline-logging-functions.sh" - -eng_root=`cd -P "$_script_dir/.." && pwd` -repo_root=`cd -P "$_script_dir/../.." && pwd` -artifacts_dir="$repo_root/artifacts" -toolset_dir="$artifacts_dir/toolset" -tools_dir="$repo_root/.tools" -log_dir="$artifacts_dir/log/$configuration" -temp_dir="$artifacts_dir/tmp/$configuration" - -global_json_file="$repo_root/global.json" -# determine if global.json contains a "runtimes" entry -global_json_has_runtimes=false -dotnetlocal_key=`grep -m 1 "runtimes" "$global_json_file"` || true -if [[ -n "$dotnetlocal_key" ]]; then - global_json_has_runtimes=true -fi - -# HOME may not be defined in some scenarios, but it is required by NuGet -if [[ -z $HOME ]]; then - export HOME="$repo_root/artifacts/.home/" - mkdir -p "$HOME" -fi - -mkdir -p "$toolset_dir" -mkdir -p "$temp_dir" -mkdir -p "$log_dir" - -if [[ $ci == true ]]; then - export TEMP="$temp_dir" - export TMP="$temp_dir" -fi +#!/usr/bin/env bash + +# Initialize variables if they aren't already defined. + +# CI mode - set to true on CI server for PR validation build or official build. +ci=${ci:-false} + +# Set to true to use the pipelines logger which will enable Azure logging output. +# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md +# This flag is meant as a temporary opt-opt for the feature while validate it across +# our consumers. It will be deleted in the future. +if [[ "$ci" == true ]]; then + pipelines_log=${pipelines_log:-true} +else + pipelines_log=${pipelines_log:-false} +fi + +# Build configuration. Common values include 'Debug' and 'Release', but the repository may use other names. +configuration=${configuration:-'Debug'} + +# Set to true to output binary log from msbuild. Note that emitting binary log slows down the build. +# Binary log must be enabled on CI. +binary_log=${binary_log:-$ci} + +# Turns on machine preparation/clean up code that changes the machine state (e.g. kills build processes). +prepare_machine=${prepare_machine:-false} + +# True to restore toolsets and dependencies. +restore=${restore:-true} + +# Adjusts msbuild verbosity level. +verbosity=${verbosity:-'minimal'} + +# Set to true to reuse msbuild nodes. Recommended to not reuse on CI. +if [[ "$ci" == true ]]; then + node_reuse=${node_reuse:-false} +else + node_reuse=${node_reuse:-true} +fi + +# Configures warning treatment in msbuild. +warn_as_error=${warn_as_error:-true} + +# True to attempt using .NET Core already that meets requirements specified in global.json +# installed on the machine instead of downloading one. +use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} + +# True to use global NuGet cache instead of restoring packages to repository-local directory. +if [[ "$ci" == true ]]; then + use_global_nuget_cache=${use_global_nuget_cache:-false} +else + use_global_nuget_cache=${use_global_nuget_cache:-true} +fi + +# Resolve any symlinks in the given path. +function ResolvePath { + local path=$1 + + while [[ -h $path ]]; do + local dir="$( cd -P "$( dirname "$path" )" && pwd )" + path="$(readlink "$path")" + + # if $path was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $path != /* ]] && path="$dir/$path" + done + + # return value + _ResolvePath="$path" +} + +# ReadVersionFromJson [json key] +function ReadGlobalVersion { + local key=$1 + + local line=`grep -m 1 "$key" "$global_json_file"` + local pattern="\"$key\" *: *\"(.*)\"" + + if [[ ! $line =~ $pattern ]]; then + Write-PipelineTelemetryError -category 'InitializeTools' "Error: Cannot find \"$key\" in $global_json_file" + ExitWithExitCode 1 + fi + + # return value + _ReadGlobalVersion=${BASH_REMATCH[1]} +} + +function InitializeDotNetCli { + if [[ -n "${_InitializeDotNetCli:-}" ]]; then + return + fi + + local install=$1 + + # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism + export DOTNET_MULTILEVEL_LOOKUP=0 + + # Disable first run since we want to control all package sources + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + # Disable telemetry on CI + if [[ $ci == true ]]; then + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + fi + + # LTTNG is the logging infrastructure used by Core CLR. Need this variable set + # so it doesn't output warnings to the console. + export LTTNG_HOME="$HOME" + + # Source Build uses DotNetCoreSdkDir variable + if [[ -n "${DotNetCoreSdkDir:-}" ]]; then + export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir" + fi + + # Find the first path on $PATH that contains the dotnet.exe + if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then + local dotnet_path=`command -v dotnet` + if [[ -n "$dotnet_path" ]]; then + ResolvePath "$dotnet_path" + export DOTNET_INSTALL_DIR=`dirname "$_ResolvePath"` + fi + fi + + ReadGlobalVersion "dotnet" + local dotnet_sdk_version=$_ReadGlobalVersion + local dotnet_root="" + + # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version, + # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues. + if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then + dotnet_root="$DOTNET_INSTALL_DIR" + else + dotnet_root="$repo_root/.dotnet" + + export DOTNET_INSTALL_DIR="$dotnet_root" + + if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then + if [[ "$install" == true ]]; then + InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" + else + Write-PipelineTelemetryError -category 'InitializeToolset' "Unable to find dotnet with SDK version '$dotnet_sdk_version'" + ExitWithExitCode 1 + fi + fi + fi + + # Add dotnet to PATH. This prevents any bare invocation of dotnet in custom + # build steps from using anything other than what we've downloaded. + export PATH="$dotnet_root:$PATH" + + if [[ $ci == true ]]; then + # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build + echo "##vso[task.prependpath]$dotnet_root" + echo "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0" + echo "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1" + fi + + # return value + _InitializeDotNetCli="$dotnet_root" +} + +function InstallDotNetSdk { + local root=$1 + local version=$2 + local architecture="" + if [[ $# == 3 ]]; then + architecture=$3 + fi + InstallDotNet "$root" "$version" $architecture +} + +function InstallDotNet { + local root=$1 + local version=$2 + + GetDotNetInstallScript "$root" + local install_script=$_GetDotNetInstallScript + + local archArg='' + if [[ -n "${3:-}" ]]; then + archArg="--architecture $3" + fi + local runtimeArg='' + if [[ -n "${4:-}" ]]; then + runtimeArg="--runtime $4" + fi + + local skipNonVersionedFilesArg="" + if [[ "$#" -ge "5" ]]; then + skipNonVersionedFilesArg="--skip-non-versioned-files" + fi + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." + ExitWithExitCode $exit_code + } +} + +function GetDotNetInstallScript { + local root=$1 + local install_script="$root/dotnet-install.sh" + local install_script_url="https://dot.net/v1/dotnet-install.sh" + + if [[ ! -a "$install_script" ]]; then + mkdir -p "$root" + + echo "Downloading '$install_script_url'" + + # Use curl if available, otherwise use wget + if command -v curl > /dev/null; then + curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" + else + wget -q -O "$install_script" "$install_script_url" + fi + fi + + # return value + _GetDotNetInstallScript="$install_script" +} + +function InitializeBuildTool { + if [[ -n "${_InitializeBuildTool:-}" ]]; then + return + fi + + InitializeDotNetCli $restore + + # return values + _InitializeBuildTool="$_InitializeDotNetCli/dotnet" + _InitializeBuildToolCommand="msbuild" + _InitializeBuildToolFramework="netcoreapp2.1" +} + +function GetNuGetPackageCachePath { + if [[ -z ${NUGET_PACKAGES:-} ]]; then + if [[ "$use_global_nuget_cache" == true ]]; then + export NUGET_PACKAGES="$HOME/.nuget/packages" + else + export NUGET_PACKAGES="$repo_root/.packages" + fi + fi + + # return value + _GetNuGetPackageCachePath=$NUGET_PACKAGES +} + +function InitializeNativeTools() { + if grep -Fq "native-tools" $global_json_file + then + local nativeArgs="" + if [[ "$ci" == true ]]; then + nativeArgs="-InstallDirectory $tools_dir" + fi + "$_script_dir/init-tools-native.sh" $nativeArgs + fi +} + +function InitializeToolset { + if [[ -n "${_InitializeToolset:-}" ]]; then + return + fi + + GetNuGetPackageCachePath + + ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk" + + local toolset_version=$_ReadGlobalVersion + local toolset_location_file="$toolset_dir/$toolset_version.txt" + + if [[ -a "$toolset_location_file" ]]; then + local path=`cat "$toolset_location_file"` + if [[ -a "$path" ]]; then + # return value + _InitializeToolset="$path" + return + fi + fi + + if [[ "$restore" != true ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Toolset version $toolset_version has not been restored." + ExitWithExitCode 2 + fi + + local proj="$toolset_dir/restore.proj" + + local bl="" + if [[ "$binary_log" == true ]]; then + bl="/bl:$log_dir/ToolsetRestore.binlog" + fi + + echo '' > "$proj" + MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" + + local toolset_build_proj=`cat "$toolset_location_file"` + + if [[ ! -a "$toolset_build_proj" ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Invalid toolset path: $toolset_build_proj" + ExitWithExitCode 3 + fi + + # return value + _InitializeToolset="$toolset_build_proj" +} + +function ExitWithExitCode { + if [[ "$ci" == true && "$prepare_machine" == true ]]; then + StopProcesses + fi + exit $1 +} + +function StopProcesses { + echo "Killing running build processes..." + pkill -9 "dotnet" || true + pkill -9 "vbcscompiler" || true + return 0 +} + +function MSBuild { + local args=$@ + if [[ "$pipelines_log" == true ]]; then + InitializeBuildTool + InitializeToolset + local toolset_dir="${_InitializeToolset%/*}" + local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" + args=( "${args[@]}" "-logger:$logger_path" ) + fi + + MSBuild-Core ${args[@]} +} + +function MSBuild-Core { + if [[ "$ci" == true ]]; then + if [[ "$binary_log" != true ]]; then + Write-PipelineTaskError "Binary log must be enabled in CI build." + ExitWithExitCode 1 + fi + + if [[ "$node_reuse" == true ]]; then + Write-PipelineTaskError "Node reuse must be disabled in CI build." + ExitWithExitCode 1 + fi + fi + + InitializeBuildTool + + local warnaserror_switch="" + if [[ $warn_as_error == true ]]; then + warnaserror_switch="/warnaserror" + fi + + "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || { + local exit_code=$? + Write-PipelineTaskError "Build failed (exit code '$exit_code')." + ExitWithExitCode $exit_code + } +} + +ResolvePath "${BASH_SOURCE[0]}" +_script_dir=`dirname "$_ResolvePath"` + +. "$_script_dir/pipeline-logging-functions.sh" + +eng_root=`cd -P "$_script_dir/.." && pwd` +repo_root=`cd -P "$_script_dir/../.." && pwd` +artifacts_dir="$repo_root/artifacts" +toolset_dir="$artifacts_dir/toolset" +tools_dir="$repo_root/.tools" +log_dir="$artifacts_dir/log/$configuration" +temp_dir="$artifacts_dir/tmp/$configuration" + +global_json_file="$repo_root/global.json" +# determine if global.json contains a "runtimes" entry +global_json_has_runtimes=false +dotnetlocal_key=`grep -m 1 "runtimes" "$global_json_file"` || true +if [[ -n "$dotnetlocal_key" ]]; then + global_json_has_runtimes=true +fi + +# HOME may not be defined in some scenarios, but it is required by NuGet +if [[ -z $HOME ]]; then + export HOME="$repo_root/artifacts/.home/" + mkdir -p "$HOME" +fi + +mkdir -p "$toolset_dir" +mkdir -p "$temp_dir" +mkdir -p "$log_dir" + +if [[ $ci == true ]]; then + export TEMP="$temp_dir" + export TMP="$temp_dir" +fi diff --git a/global.json b/global.json index 61df4b7e1f8..5c2f6dc81e0 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19326.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19326.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19327.39", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19327.39" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From cdb8e5672822d72cc360689ecab4870213098abb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 13:02:41 +0000 Subject: [PATCH 004/227] Update dependencies from https://github.com/dotnet/winforms build 20190627.3 (#1115) - Microsoft.Private.Winforms - 4.8.0-preview7.19327.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c43f98447d9..0f5d8c15ecf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 9b0ec7bb6e82818a4ac80702a9cd5c45f5d2ffde + d6d68878828e5f96f91da68a956a1a49f058e2f4 diff --git a/eng/Versions.props b/eng/Versions.props index 48b489e4ce2..4cbd48d05c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview7.19325.3 + 4.8.0-preview7.19327.3 From 1e302f11a6f75b9baf16b13ca1f8802b84cc050a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2019 13:15:22 +0000 Subject: [PATCH 005/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190627.5 (#1116) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19327.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f5d8c15ecf..0a671a56d51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 95335bdc0bbae81d9a378fe5a4b13c831d5a27c3 + f1e63734270607bd9246383cd72132c7ecae89be https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 4cbd48d05c7..0aba4b941fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19326.19 + 4.8.0-preview8.19327.5 From 58e56b4c443146aa8c185d780ffc2c33cbbbcb2d Mon Sep 17 00:00:00 2001 From: Rob LaDuca Date: Fri, 28 Jun 2019 13:14:27 -0700 Subject: [PATCH 006/227] Removing unused source from PresentationFramework. (#1119) --- .../AppModel/ApplicationProxyInternal.cs | 1161 ---------------- .../AppModel/DeploymentExceptionMapper.cs | 261 ---- .../MS/Internal/AppModel/IHostService.cs | 51 - .../AppModel/PresentationAppDomainManager.cs | 356 ----- .../MS/Internal/AppModel/RootBrowserWindow.cs | 1140 --------------- .../AppModel/RootBrowserWindowProxy.cs | 62 - .../MS/Internal/AppModel/XappLauncher.cs | 1227 ----------------- .../PresentationFramework.csproj | 9 - .../Peers/RootBrowserWindowAutomationPeer.cs | 27 - 9 files changed, 4294 deletions(-) delete mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ApplicationProxyInternal.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/DeploymentExceptionMapper.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/IHostService.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/PresentationAppDomainManager.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/RootBrowserWindow.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/RootBrowserWindowProxy.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/XappLauncher.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/RootBrowserWindowAutomationPeer.cs diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ApplicationProxyInternal.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ApplicationProxyInternal.cs deleted file mode 100644 index 9f2c6aca389..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ApplicationProxyInternal.cs +++ /dev/null @@ -1,1161 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -//------------------------------------------------------------------------------ -// -// -// -// Description: This is an internal proxy wrapper class over Application class. -// This derives from MarshalByRefObject and thus facilitates calling -// the AppCode from DocobjHost that may be running in a different -// AppDomain. The other thing it allows is to be able to create -// the App Object on the right thread by exposing a delegate that -// could be set to point to the code that creates the AppObject and -// invoking the delegate from the right thread. -// -// -// - -//------------------------------------------------------------------------------ - -//** -//** IMPORTANT: Running arbitrary application code in the context of an incoming call from the browser -//** should be avoided. This could lead to unexpected reentrancy (on either side) or making the -// browser frame unresponsive while the application code is running. Bug 1139336 illustrates -// what can happen if the application code enters a local message loop while the browser is -// blocked. To avoid such situations in general, use Dispatcher.BeginInvoke() instead of making -// direct calls into unknown code. - - -using System; -using System.Diagnostics; -using System.IO; -using System.IO.Packaging; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using System.Security; -using System.Threading; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Controls.Primitives; -using System.Windows.Input; -using System.Windows.Interop; -using System.Windows.Navigation; -using System.Windows.Threading; - -using MS.Internal; -using MS.Internal.Documents; -using MS.Internal.Documents.Application; -using MS.Internal.IO.Packaging; -using MS.Internal.IO.Packaging.CompoundFile; -using MS.Internal.PresentationFramework; -using MS.Internal.Utility; -using MS.Internal.AppModel; -using MS.Utility; - -//In order to avoid generating warnings about unknown message numbers and -//unknown pragmas when compiling your C# source code with the actual C# compiler, -//you need to disable warnings 1634 and 1691. (Presharp Documentation) -#pragma warning disable 1634, 1691 - -namespace MS.Internal.AppModel -{ - // All security sensitive classes should be sealed or protected with InheritanceDemand - internal sealed class ApplicationProxyInternal : MarshalByRefObject - { - [Serializable] - internal class InitData - { - internal IServiceProvider ServiceProvider; - - internal IHostBrowser HostBrowser; - internal SecurityCriticalDataForSet MimeType; - internal SecurityCriticalDataForSet ActivationUri; - internal string Fragment; - internal object UcomLoadIStream; - internal bool HandleHistoryLoad; - internal string UserAgentString; - internal HostingFlags HostingFlags; - internal Rect WindowRect; - internal bool ShowWindow; - }; - - //------------------------------------------------------ - // - // Constructors - // - //------------------------------------------------------ - #region Constructors - - /// - /// ApplicationProxyInternal is created only for browser-hosted applications. - /// - internal ApplicationProxyInternal() - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_AppProxyCtor); - - if (_proxyInstance != null) - { - throw new InvalidOperationException(SR.Get(SRID.MultiSingleton, this.GetType().FullName)); - } - // Set this here so it will be true for documents or applications (i.e. anything in the browser.) - BrowserInteropHelper.SetBrowserHosted(true); - _proxyInstance = this; - } - - #endregion Constructors - - //------------------------------------------------------ - // - // Internal Methods - // - //------------------------------------------------------ - #region Internal Methods - - public override object InitializeLifetimeService() - { - //Keeps it alive until the AppDomain is teared down which is what we want. - //Otherwise the .Net remoting infrastructure releases all remote objects in 5 mins - //if there are no sponsors registered with the lease manager for the remote object. - //This is an alternative to the client side registering a sponsor by the server object - //marking itself to be kept alive for the life of the AppDomain. - return null; - } - - //Creates the internal RootBrowserWindow. If the startup Uri points - //to a Window/NavigationWindow, we still need to create this empty - //RootBrowserWindow so we can repaint properly inside the browser window - - internal void CreateRootBrowserWindow() - { - if (_rbw.Value == null) - { - - Application.Current.Dispatcher.Invoke( - DispatcherPriority.Send, - new DispatcherOperationCallback(_CreateRootBrowserWindowCallback), - null); - } - } - - internal bool FocusedElementWantsBackspace() - { - TextBoxBase textBoxBase = Keyboard.FocusedElement as TextBoxBase; - if (textBoxBase != null) - { - return true; // textBoxBase.IsEmpty - } - - PasswordBox passwordBox = Keyboard.FocusedElement as PasswordBox; - if (passwordBox != null) - { - return true; // passwordBox.IsEmpty - } - - return false; - } - - private object _CreateRootBrowserWindowCallback(object unused) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_RootBrowserWindowSetupStart); - - RootBrowserWindow = RootBrowserWindow.CreateAndInitialize(); - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_RootBrowserWindowSetupEnd); - - return null ; - } - - // Calls the Run method on the app object. - internal int Run(InitData initData) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_AppProxyRunStart); - - // Keep in mind that Run() is called once in the default AppDomain and then in the XBAP's domain. - // We want initialization of statics to happen in both AppDomains. - - if (!AppDomain.CurrentDomain.IsDefaultAppDomain()) - { - // Since IHostBrowser was marshaled from the default AppDomain as a managed interface, we get - // a Remoting transparent proxy here. Any calls on the interface would have to first be marshaled - // to the default AppDomain, where the CLR will realize it's actually a COM interface. This is - // wasteful since the object lives in the browser process. So, to shake off the Remoting layer, - // we round-trip the IHostBrowser reference through IUknown/IntPtr. - IntPtr pObj = Marshal.GetIUnknownForObject(initData.HostBrowser); - try { initData.HostBrowser = (IHostBrowser)Marshal.GetObjectForIUnknown(pObj); } - finally { Marshal.Release(pObj); } - } - BrowserInteropHelper.HostBrowser = initData.HostBrowser; - - MimeType mimeType = initData.MimeType.Value; - _mimeType.Value = mimeType; - Uri = initData.ActivationUri.Value; - WpfWebRequestHelper.DefaultUserAgent = initData.UserAgentString; - BrowserInteropHelper.HostingFlags = initData.HostingFlags; - - // These methods are asynchronous. - // If the RootBrowserWindow is not created yet, only the size for it will be stored. - Move(initData.WindowRect); - Show(initData.ShowWindow); - - switch (mimeType) - { - case MimeType.Markup: - // Make a dummy application (in lieu of the one provided by the defunct XamlViewer.xbap). - Invariant.Assert(AppDomain.CurrentDomain.FriendlyName == "XamlViewer"); - Application app = new Application(); - app.StartupUri = Uri; - // Any URL #fragment is appended to StartupUri in _RunDelegate(). - // For history navigation, ApplicationProxyInternal has already started navigation to the - // last journal entry captured. (This journal entry may include a #fragment target and/or - // a CustomContentState.) - break; - - case MimeType.Application: - //This is a browser app, the application object has already been created - break; - - case MimeType.Document: - throw new NotImplementedException(); // removed in v4 - case MimeType.Unknown: - default: - throw new InvalidOperationException(); - } - - // Set the Application.MimeType - // Since loading containers causes the application to be constructed now, - // the initial setting of the MimeType does not get passed to the application. - Application.Current.MimeType = mimeType; - ServiceProvider = initData.ServiceProvider; // also sets Application.ServiceProvider - - Application.Current.Dispatcher.Invoke( - DispatcherPriority.Send, - new DispatcherOperationCallback(_RunDelegate), - initData); - - int exitCode = Application.Current.RunInternal(null); - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_AppProxyRunEnd); - - return exitCode; - } - - private object _RunDelegate( object args ) - { - InitData initData = (InitData)args; - - Application currentApp = Application.Current; - if (currentApp != null && !(currentApp is XappLauncherApp)) - { - string fragment = initData.Fragment; - if (!String.IsNullOrEmpty(fragment) && currentApp.StartupUri != null) - { - // Apply Fragment to Application StartupUri. - UriBuilder uriBuilder; - Uri absUri = currentApp.StartupUri; - - if (currentApp.StartupUri.IsAbsoluteUri == false) - { - absUri = new Uri(BindUriHelper.BaseUri, currentApp.StartupUri); - } - - uriBuilder = new UriBuilder(absUri); - if (fragment.StartsWith(FRAGMENT_MARKER, StringComparison.Ordinal)) - { - fragment = fragment.Substring(FRAGMENT_MARKER.Length); - } - uriBuilder.Fragment = fragment; - currentApp.StartupUri = uriBuilder.Uri; - } - - CreateRootBrowserWindow(); - } - - //If we were started through IPersistHistory::Load, load from the history stream instead - //of navigating to the StartupPage - if (initData.UcomLoadIStream != null && initData.HandleHistoryLoad) - { - LoadHistoryStream(DocObjHost.ExtractComStream(initData.UcomLoadIStream), /*firstHistoryLoad=s*/true); - } - return null; - } - - // Show or hide view. - internal void Show(bool show) - { - _show = show; - if (Application.Current != null && RootBrowserWindow != null) - { - Application.Current.Dispatcher.BeginInvoke( - DispatcherPriority.Send, - new DispatcherOperationCallback(_ShowDelegate), - null); - } - - } - - private object _ShowDelegate(object ignore) - { - // The RBW might be torn down just before the DispatcherOperation is invoked. - if (RootBrowserWindow == null || Application.IsShuttingDown) - return null; - - if (_show) - { - // The window is shown asynchronously (using Visibility, not Show()) to allow first restoring - // the Journal on history navigation. This prevents bug 1367999. - _rbw.Value.Visibility = Visibility.Visible; - - // initial focus should be on us, not the browser frame - // Focusing is done asynchronously because Visibility actually changes asynchronously. - Application.Current.Dispatcher.BeginInvoke( - // same priority as used in the Window.Visibility PropertyChangedCallback - DispatcherPriority.Normal, - new DispatcherOperationCallback(_FocusDelegate), null); - } - else - { - _rbw.Value.Visibility = Visibility.Hidden; - } - - return null; - } - - private object _FocusDelegate(object unused) - { - if (_rbw.Value != null) - { - try - { - MS.Win32.UnsafeNativeMethods.SetFocus(new HandleRef(_rbw.Value, _rbw.Value.CriticalHandle)); - } -#pragma warning disable 6502 - // The browser may temporarily disable the RBW. Then SetFocus() fails. - // This is known to happen when the browser pops up the modal dialog about the Information Bar. - catch (System.ComponentModel.Win32Exception) - { - Debug.WriteLine("SetFocus() on RootBrowserWindow failed."); - } -#pragma warning restore 6502 - } - return null; - } - - internal void Move(Rect windowRect) - { - if (Application.Current != null && RootBrowserWindow != null) - { - Application.Current.Dispatcher.BeginInvoke( - DispatcherPriority.Send, - new DispatcherOperationCallback(_MoveDelegate), - windowRect); - } - else - { - // We got UIActivated too early. Remember the data passed in. - _windowRect = windowRect; - _rectset = true; - } - } - - private object _MoveDelegate( object moveArgs ) - { - // The RBW might be closed just before _MoveDelegate() is called. => check _rbw again. - if (_rbw.Value != null && !Application.IsShuttingDown) - { - Rect r = (Rect)moveArgs; - - // ResizeMove is implemented by RBW and should be called here - // since it resizes and moves the WS_CHILD window. Do not call - // Height/Width & Top/Left here since they govern the browser - // window properties. - _rbw.Value.ResizeMove((int)r.X, (int)r.Y, (int)r.Width, (int)r.Height); - } - return null; - } - - // Shutdown the App. - // Note: The "post" in the method name is legacy. Now all of Application's shutdown work is complete - // when this method returns. In particular, the managed Dispatcher is shut down. - internal void PostShutdown() - { - Cleanup(); - _proxyInstance = null; - - Application app = Application.Current; - if (app != null) - { - XappLauncherApp launcherApp = app as XappLauncherApp; - if (launcherApp != null) - { - launcherApp.AbortActivation(); - Debug.Assert(Application.IsShuttingDown); - } - else - { - //this calls into the internal helper and is hardcoded for a clean - // shutdown - app.CriticalShutdown(0); - - // The Application.Exit event is raised in a Dispatcher callback at Normal priority. - // Blocking on this callback here ensures that the event will be raised before we've - // disconnected from the browser. An XBAP may want, in particular, to write a cookie. - app.Dispatcher.Invoke(DispatcherPriority.Normal, - new DispatcherOperationCallback(delegate(object unused) { return null; }), null); - } - } - } - - // - // Activate or Deactivate RootBrowserWindow - // - - internal void Activate(bool fActivate) - { - if (Application.Current != null && RootBrowserWindow != null) - { - Application.Current.Dispatcher.BeginInvoke( - DispatcherPriority.Send, - new DispatcherOperationCallback(_ActivateDelegate), - fActivate); - } - } - - private object _ActivateDelegate(object arg ) - { - if (RootBrowserWindow != null) - { - bool fActivate = (bool)arg; - - _rbw.Value.HandleActivate(fActivate); - if (fActivate) - { - _FocusDelegate(null); - } - } - return null; - } - - internal bool CanInvokeJournalEntry(int entryId) - { - if (Application.Current == null) - { - return false; - } - - return (bool)Application.Current.Dispatcher.Invoke( - DispatcherPriority.Send, - (DispatcherOperationCallback) delegate(object unused) - { - NavigationWindow window = Application.Current.MainWindow as NavigationWindow; - - if (window == null) - return false; - - return window.JournalNavigationScope.CanInvokeJournalEntry(entryId); - }, - null); - } - - // Private class just to facilitate passing of data back to GetSaveHistoryBytes. - private class SaveHistoryReturnInfo - { - internal string uri; - internal string title; - internal int entryId; - internal byte[] saveByteArray ; - } - - /// Called by the browser to serialize the entire journal or just the index of - /// the current entry. The second case is when an internal Journal update needs to be - /// reflected in the TravelLog. - /// - /// true is the entire Journal is to serialized - private object _GetSaveHistoryBytesDelegate(object arg) - { - bool entireJournal = (bool)arg; - - SaveHistoryReturnInfo info = new SaveHistoryReturnInfo(); - - // DevDiv 716414 / DevDiv2 196517 & 224724: - // Checking _serviceProvider for null due to COM reentrancy issues observed by customers. - // Users who perform frequent refreshes may experience shutdown while we are still starting up and are not fully initialized. - // The ServiceProvider field is one of the last things to be set during initialization, so if this is null - // we know that we have not finished initialization much less run the app and thus have no need to save history. - if (_serviceProvider == null) - return null; - - // When we are here, the browser has just started to shut down, so we should only check - // whether the application object is shutting down. - if (Application.IsApplicationObjectShuttingDown == true) - return null; - - Invariant.Assert(_rbw.Value != null, "BrowserJournalingError: _rbw should not be null"); - - Journal journal = _rbw.Value.Journal; - Invariant.Assert(journal != null, "BrowserJournalingError: Could not get internal journal for the window"); - - JournalEntry entry; - if (entireJournal) // The application is about to be shut down... - { - NavigationService topNavSvc = _rbw.Value.NavigationService; - try - { - topNavSvc.RequestCustomContentStateOnAppShutdown(); - } - catch(Exception e) - { - if(CriticalExceptions.IsCriticalException(e)) - { - throw; - } - } - - journal.PruneKeepAliveEntries(); - - // Since the current page is not added to the journal until it is replaced, - // we add it here explicitly to the internal Journal before serializing it. - entry = topNavSvc.MakeJournalEntry(JournalReason.NewContentNavigation); - if (entry != null && !entry.IsAlive()) - { - if (entry.JEGroupState.JournalDataStreams != null) - { - entry.JEGroupState.JournalDataStreams.PrepareForSerialization(); - } - journal.UpdateCurrentEntry(entry); - } - else // Maybe the current content is null or a PageFunction doesn't want to be journaled. - { // Then the previous navigable page, if any, should be remembered as current. - entry = journal.GetGoBackEntry(); - // i. _LoadHistoryStreamDelegate() has a similar special case. - } - } - else - { // (Brittle) Assumption: GetSaveHistoryBytes() is called after the current entry has - // been updated in the internal journal but before the new navigation is committed. - // This means journal.CurrentEntry is what was just added (or updated). - // Note that it would be wrong to call topNavSvc.MakeJournalEntry() in this case because - // the navigation that just took place may be in a different NavigationService (in a - // frame), and here we don't know which one it is. - entry = journal.CurrentEntry; - - // The entry may be null here when the user has selected "New Window" or pressed Ctrl+N. - // In this case the browser calls us on IPersistHistory::Save and then throws that data - // away. Hopefully at some point in the future that saved data will be loaded in the new - // window via IPersistHistory::Load. This unusual behavior is tracked in bug 1353584. - } - - if (entry != null) - { - info.title = entry.Name; - info.entryId = entry.Id; - } - else - { - info.title = _rbw.Value.Title; - } - - // We only use the base URI here because the travel log will validate a file URI when making a PIDL. - // We use the URI stored in the JournalEntry, and the travel log doesn't care what the URI is, so - // duplicates don't matter. - info.uri = BindUriHelper.UriToString(Uri); - - MemoryStream saveStream = new MemoryStream(); - - saveStream.Seek(0, SeekOrigin.Begin); - - if (entireJournal) - { - //Save the Journal and BaseUri also. We don't need BaseUri except for the xaml case - //since this is set specially for the container case (ssres scheme). Exe case - //will pretty much set it to the exe path. For the xaml case it is set to the path - //of the first uri(eg BaseDir\page1.xaml) that was navigated to. - //BaseDir/Subdir/page2.xaml is also considered to be in the same extent and when - //we navigate back to the app from a webpage, the baseUri should still be BaseDir - //not BaseDir/Subdir. We were setting the BaseDir from JournalEntry.Uri but we may - //end up setting BaseUri to BaseDir/Subdir which is not the same. So explicitly - //persist BaseUri as well - BrowserJournal browserJournal = new BrowserJournal(journal, BindUriHelper.BaseUri); - - try - { - saveStream.WriteByte(BrowserJournalHeader); - BinaryFormatter formatter = new BinaryFormatter(); - formatter.Serialize(saveStream, browserJournal); - } - catch(Exception e) - { - if(CriticalExceptions.IsCriticalException(e)) - { - throw; - } - - // The application is shutting down and the exception would not be reported anyway. - // This is here to help with debugging and failure analysis. - Invariant.Assert(false, "Failed to serialize the navigation journal: " + e); - } - } - else - { - saveStream.WriteByte(JournalIdHeader); - WriteInt32(saveStream, info.entryId); - } - - info.saveByteArray = saveStream.ToArray(); - ((IDisposable)saveStream).Dispose(); - - return info ; - } - - - internal byte[] GetSaveHistoryBytes(bool persistEntireJournal, out int journalEntryId, out string uriString, out string titleString) - { - SaveHistoryReturnInfo info = null ; - - if (Application.Current != null) - { - info = ( SaveHistoryReturnInfo) Application.Current.Dispatcher.Invoke( - DispatcherPriority.Send, - new DispatcherOperationCallback(_GetSaveHistoryBytesDelegate) , - persistEntireJournal); - } - - if ( info != null ) - { - journalEntryId = info.entryId; - uriString = info.uri; - titleString = info.title; - return info.saveByteArray; - } - else - { - journalEntryId = 0; - uriString = null; - titleString = null; - return null; - } - } - - internal void LoadHistoryStream(MemoryStream loadStream, bool firstLoadFromHistory) - { - if (Application.Current == null) - { - return; - } - - LoadHistoryStreamInfo info = new LoadHistoryStreamInfo(); - info.loadStream = loadStream ; - info.firstLoadFromHistory = firstLoadFromHistory ; - - Application.Current.Dispatcher.Invoke( - DispatcherPriority.Send, - new DispatcherOperationCallback(_LoadHistoryStreamDelegate), - info); - } - - private class LoadHistoryStreamInfo - { - internal MemoryStream loadStream ; - internal bool firstLoadFromHistory; - } - - private object _LoadHistoryStreamDelegate( object arg ) - { - Journal journal = null; - JournalEntry entry = null; - - LoadHistoryStreamInfo info = (LoadHistoryStreamInfo) arg ; - - if (IsShutdown() == true) - return null; - - // Reset the memory stream pointer back to the begining and get the persisted object - info.loadStream.Seek(0, System.IO.SeekOrigin.Begin); - - object journaledObject = DeserializeJournaledObject(info.loadStream); - - //This is the very first load from history, so need to set the BaseUri and StartupUri. - if (info.firstLoadFromHistory) - { - // The journal does not get saved on Ctrl+N. Because of this, - // here we can get just an index, like in the 'else' case below. - if(!(journaledObject is BrowserJournal)) - return null; - - BrowserJournal browserJournal = (BrowserJournal)journaledObject; - - journal = browserJournal.Journal; - entry = journal.CurrentEntry; - if (entry == null) // See special case in _GetSaveHistoryBytesDelegate(). - { - entry = journal.GetGoBackEntry(); // could still be null - } - - //This will create the frame to use for hosting - { - NavigationService navigationService = null; - navigationService = _rbw.Value.NavigationService; - } - _rbw.Value.SetJournalForBrowserInterop(journal); - - //This should already be set for the container and exe cases. The former - //sets it to the transformed ssres scheme and we don't want to overwrite it. - if (BindUriHelper.BaseUri == null) - { - BindUriHelper.BaseUri = browserJournal.BaseUri; - } - - //CHECK: For xaml case, what should we set as the Startup Uri ? We set it the initial - //uri we started with, should this be changed to creating the window explicitly - //and navigating the window instead of setting the StartupUri? - //(Application.Current as Application).StartupUri = entry.Uri; - - Debug.Assert(Application.Current != null, "BrowserJournalingError: Application object should already be created"); - - if (entry != null) - { - //Prevent navigations to StartupUri for history loads by canceling the StartingUp event - Application.Current.Startup += new System.Windows.StartupEventHandler(this.OnStartup); - - _rbw.Value.JournalNavigationScope.NavigateToEntry(entry); - } - //else: fall back on navigating to StartupUri - } - else - { - if(!(journaledObject is int)) - return null; - - journal = _rbw.Value.Journal; - - int index = journal.FindIndexForEntryWithId((int)journaledObject); - - Debug.Assert(journal[index].Id == (int)journaledObject, "BrowserJournalingError: Index retrieved from journal stream does not match index of journal entry"); - - // Check whether the navigation is canceled. - if (! _rbw.Value.JournalNavigationScope.NavigateToEntry(index)) - { - // When the navigation is canceled, we want to notify browser to prevent the internal journal from - // getting out of sync with the browser's. - // The exception will be caught by the interop layer and browser will cancel the navigation as a result. - - // If the navigation is initiated pragmatically by calling GoBack/Forward (comparing to user initiated - // by clicking the back/forward button), this will result in a managed exception at the call to ibcs.GoBack() - // in rbw.GoBackOverride(). rbw catches the exception when this happens. - - throw new OperationCanceledException(); - } - } - - return null; - } - - private object DeserializeJournaledObject(MemoryStream inputStream) - { - object deserialized = null; - - int header = inputStream.ReadByte(); - if (header >= 0) - { - switch((byte)header) - { - case JournalIdHeader : - { - deserialized = ReadInt32(inputStream); - break; - } - - case BrowserJournalHeader: - { - BinaryFormatter formatter = new BinaryFormatter(); - deserialized = formatter.Deserialize(inputStream); - break; - } - - default: - { - throw new FormatException(); - } - } - } - - return deserialized; - } - - // See if an App instance is currently loaded. - internal bool IsAppLoaded() - { - return (Application.Current == null ? false : true); - } - - // Return the internal static variable _shutdown. - internal bool IsShutdown() - { - return Application.IsShuttingDown; - } - - internal void Cleanup() - { - if (Application.Current != null) - { - IBrowserCallbackServices bcs = Application.Current.BrowserCallbackServices; - if (bcs != null) - { - Debug.Assert(!Application.IsApplicationObjectShuttingDown); - // Marshal.ReleaseComObject(bcs) has to be called so that the refcount of the - // native objects goes to zero for clean shutdown. But it should not be called - // right away, because there may still be DispatcherOperations in the queue - // that will attempt to use IBCS, especially during downloading/activation. - // Last, it can't be called with prioroty lower than Normal, because that's - // the priority of Applicatoin.ShudownCallback(), which shuts down the - // Dispatcher. - Application.Current.Dispatcher.BeginInvoke( - DispatcherPriority.Normal, new DispatcherOperationCallback(ReleaseBrowserCallback), bcs); - } - } - - ServiceProvider = null; - ClearRootBrowserWindow(); - - if (_storageRoot != null && _storageRoot.Value != null ) - { - _storageRoot.Value.Close(); - } - - // Due to the dependecies the following objects have to be released - // in the following order: _document, DocumentManager, - // _packageStream, _unmanagedStream. - - if (_document.Value is PackageDocument) - { - // We are about to close the package ad remove it from the Preloaded Packages Store. - // Let's make sure that the data structures are consistent. The package that we hold is - // actually in the store under the URI that we think it should be using - Debug.Assert(((PackageDocument)_document.Value).Package == - PreloadedPackages.GetPackage(PackUriHelper.GetPackageUri(PackUriHelper.Create(Uri)))); - - // We need to remove the Package from the PreloadedPackage storage, - // so that potential future requests would fail in a way of returning a null (resource not found) - // rather then return a Package or stream that is already Closed - PreloadedPackages.RemovePackage(PackUriHelper.GetPackageUri(PackUriHelper.Create(Uri))); - - ((PackageDocument)_document.Value).Dispose(); - _document.Value = null; - } - - if (_mimeType.Value == MimeType.Document) - { - DocumentManager.CleanUp(); - } - - if (_packageStream.Value != null) - { - _packageStream.Value.Close(); - } - - if (_unmanagedStream.Value != null) - { - Marshal.ReleaseComObject(_unmanagedStream.Value); - _unmanagedStream = new SecurityCriticalData(null); - } - } - - private object ReleaseBrowserCallback(object browserCallback) - { - Marshal.ReleaseComObject(browserCallback); - BrowserInteropHelper.ReleaseBrowserInterfaces(); - return null; - } - - #endregion Internal Methods - - //------------------------------------------------------ - // - // Internal Properties - // - //------------------------------------------------------ - #region Internal Properties - - [DebuggerBrowsable(DebuggerBrowsableState.Never)] - internal RootBrowserWindowProxy RootBrowserWindowProxy - { - get - { - if (_rbwProxy.Value == null) - { - CreateRootBrowserWindow(); - } - return _rbwProxy.Value; - } - } - - internal RootBrowserWindow RootBrowserWindow - { - get - { - return _rbw.Value; - } - private set - { - _rbw.Value = value; - if (value == null) - { - _rbwProxy.Value = null; - } - else - { - _rbwProxy.Value = new RootBrowserWindowProxy(value); - - if (_rectset == true) - { - // If UIActivation already happened, set the size with - // cached values. - Move(_windowRect); - _rectset = false; - } - - //Incase Show() was called before we had a chance to create the window - //If the old and new values are the same, this will be a no-op anyway - Show(_show); - } - } - } - - internal bool RootBrowserWindowCreated { get { return _rbw.Value != null; } } - - internal OleCmdHelper OleCmdHelper - { - get - { - if (Application.Current == null) - { - return null; - } - - return (OleCmdHelper) Application.Current.Dispatcher.Invoke( - DispatcherPriority.Send, - (DispatcherOperationCallback) delegate(object unused) - { - // V3.5: Check for Application object shutting down only. - // Consider to check for Browser shutting down. - if (Application.IsApplicationObjectShuttingDown == true) - return null; - - if (_oleCmdHelper == null) - { - _oleCmdHelper = new OleCmdHelper(); - } - return _oleCmdHelper; - }, - null); - } - } - - internal static ApplicationProxyInternal Current - { - get { return _proxyInstance; } - } - - internal Uri Uri - { - get - { - return _criticalUri.Value; - } - private set - { - _criticalUri.Value = value; - - // We need to set these properties now, because there are times during the application's lifetime - // when the source URI would be useful, but the ApplicationProxyInternal has come and gone. - // If there is DebugSecurityZoneUrl, SiteOfOriginContainer.BrowserSource would have been set to that value. - // We don't want to overwrite that, so check whether the value is null or not before setting. - if (SiteOfOriginContainer.BrowserSource == null) - { - SiteOfOriginContainer.BrowserSource = value; - } - } - } - - internal void SetDebugSecurityZoneURL(Uri debugSecurityZoneURL) - { - SiteOfOriginContainer.BrowserSource = debugSecurityZoneURL; - } - - internal object StreamContainer - { - set - { - _unmanagedStream = new SecurityCriticalData(Marshal.GetObjectForIUnknown((IntPtr)value)); - } - } - - #endregion Internal Properties - - //------------------------------------------------------ - // - // Private Methods - // - //------------------------------------------------------ - #region Private Methods - - private void OnStartup(Object sender, StartupEventArgs e) - { - //We listen to the Startup event only for history loads in which - //case we want to do our journaling load instead of StartupUri load - e.PerformDefaultAction = false; - Application.Current.Startup -= new System.Windows.StartupEventHandler(this.OnStartup); - } - - - private void ClearRootBrowserWindow() - { - RootBrowserWindow = null; - } - - private static void WriteInt32(Stream stream, int value) - { - stream.WriteByte((byte)((value & 0xFF000000) >> 24)); - stream.WriteByte((byte)((value & 0x00FF0000) >> 16)); - stream.WriteByte((byte)((value & 0x0000FF00) >> 8)); - stream.WriteByte((byte)((value & 0x000000FF))); - } - - private static int ReadInt32(Stream stream) - { - int value = 0; - for (int i = 0; i < 4; i++) - { - int b = stream.ReadByte(); - if (b < 0) - { - throw new EndOfStreamException(); - } - - value = (value << 8) | b; - } - - return value; - } - - #endregion Private Methods - - #region Private Properties - - private IServiceProvider ServiceProvider - { - set - { - _serviceProvider = value; - - if (Application.Current != null) - { - Application.Current.ServiceProvider = value; - } - } - } - - #endregion - - //------------------------------------------------------ - // - // Private Fields - // - //------------------------------------------------------ - #region Private Fields - - // Instance fields. - - // These are fields that moved from DocobjHost class so we can have a - // unified way of calling for single vs multiple AppDomain scenarios. - - private SecurityCriticalDataForSet _rbw; - - private SecurityCriticalDataForSet _rbwProxy; - - private bool _show; - private OleCmdHelper _oleCmdHelper; - - // The following variables are used to remember the window size until the window is created - // because the OLE SetRect/Show calls happen before the app and window are created internally - Rect _windowRect; - bool _rectset; - - private SecurityCriticalDataForSet _criticalUri; - SecurityCriticalDataClass _storageRoot = new SecurityCriticalDataClass(null); - SecurityCriticalDataForSet _mimeType; - IServiceProvider _serviceProvider ; - - private static ApplicationProxyInternal _proxyInstance; - - private const string FRAGMENT_MARKER = "#"; - - private const byte JournalIdHeader = 0x01; - private const byte BrowserJournalHeader = 0x02; - - #region XpsViewer (DocumentApplication) Specific - /// - /// This is an unmanaged COM IStream that is provided by the byte range downloader - /// (progressive download) and comes from our unmanaged host. - /// - SecurityCriticalData _unmanagedStream = new SecurityCriticalData(null); - - /// - /// This is a ByteWrapper a managed class that is an adapter from IStream to Stream. - /// The stream it wraps is the _unmanagedStream. - /// - SecurityCriticalData _packageStream = new SecurityCriticalData(null); - - /// - /// This contains many streams and packages that represent the current 'Package' - /// for the XpsViewer. - /// - // The Document has been weakly-typed to avoid PresentationFramework - // having a type dependency on PresentationUI. The perf impact of the weak - // typed variables in this case was determined to be much less than forcing the load - // of a new assembly when Assembly.GetTypes was called on PresentationFramework. - SecurityCriticalDataForSet _document; - #endregion - - #endregion Private Fields - - #region Private Structs - /// - /// Holder for all things to be persisted in the BrowserJournal before we - /// navigate away from the app - /// - [Serializable] - private struct BrowserJournal - { - #region Constructors - internal BrowserJournal(Journal journal, Uri baseUri) - { - _journal = journal; - _baseUri = baseUri; - } - #endregion Constructors - - #region Properties - internal Journal Journal - { - get { return _journal; } - } - - internal Uri BaseUri - { - get { return _baseUri; } - } - #endregion Properties - - #region Private Fields - private Journal _journal; - private Uri _baseUri; - #endregion Private Fields - } - #endregion Private Structs - - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/DeploymentExceptionMapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/DeploymentExceptionMapper.cs deleted file mode 100644 index 81c22f8be72..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/DeploymentExceptionMapper.cs +++ /dev/null @@ -1,261 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -//--------------------------------------------------------------------------- -// -// -// -// Description: DeploymentExceptionMapper class definition. -// - -//--------------------------------------------------------------------------- - -using System; -using System.Collections; -using System.Globalization; -using System.Resources; -using System.Reflection; -using System.Windows; -using System.Windows.Interop; -using System.Deployment.Application; -using System.Text.RegularExpressions; - -namespace MS.Internal -{ - internal enum MissingDependencyType - { - Others = 0, - WinFX = 1, - CLR = 2 - } - - internal static class DeploymentExceptionMapper - { - // This is the hardcoded fwlink query parameters, the only dynamic data we pass to fwlink server - // is the WinFX or CLR version we parse from the ClickOnce error message. - // Product ID is always 11953 which is the WinFX Runtime Components and subproduct is always bootwinfx - // The winfxsetup.exe is language neutral so we always specify 0x409 for languages. - const string fwlinkPrefix = "http://go.microsoft.com/fwlink?prd=11953&sbp=Bootwinfx&pver="; - const string fwlinkSuffix = "&plcid=0x409&clcid=0x409&"; - - //------------------------------------------------------ - // - // Internal Methods - // - //------------------------------------------------------ - #region Internal Methods - - // Check if the platform exception is due to missing WinFX or CLR dependency - // Parse the exception message and find out the dependent WinFX version and create the - // corresponding fwlink Uri. - static internal MissingDependencyType GetWinFXRequirement(Exception e, - InPlaceHostingManager hostingManager, - out string version, - out Uri fwlinkUri) - { - version = String.Empty; - fwlinkUri = null; - - // ClickOnce detects whether it's running as part of the v3.5 "client" subset ("Arrowhead") and - // if so blocks older applications that don't explicitly opt into the subset framework. - // (Unfortunately, it does not block an application targeting the full 3.5 SP1 framework this way.) - // The exception message has ".NET Framework 3.5 SP1" hard-coded in it (referring to the version - // of the framework needed to run the application, which is not strictly right, but older versions - // can't/shouldn't be installed on top of the "client" subset). - // To make this exception message parsing at least potentially somewhat future-proof, a regex is - // used that allows for some variability of syntax and version number. - // We don't include the "SP1" part in the fwlink query. This is for consistency with the detection - // via sentinel assemblies. The server can be updated to offer the latest release/SP compatible - // with the requested major.minor version. - if (e is DependentPlatformMissingException) - { - Regex regex = new Regex(@".NET Framework (v\.?)?(?\d{1,2}(\.\d{1,2})?)", - RegexOptions.ExplicitCapture|RegexOptions.IgnoreCase); - string msg = e.Message; - Match match = regex.Match(msg); - if(match.Success) - { - version = match.Groups[1].Value; - ConstructFwlinkUrl(version, out fwlinkUri); - return MissingDependencyType.WinFX; - } - } - - // Load the clickonce resource and use it to parse the exception message - Assembly deploymentDll = Assembly.GetAssembly(hostingManager.GetType()); - - if (deploymentDll == null) - { - return MissingDependencyType.Others; - } - - ResourceManager resourceManager = new ResourceManager("System.Deployment", deploymentDll); - - if (resourceManager == null) - { - return MissingDependencyType.Others; - } - - String clrProductName = resourceManager.GetString("PlatformMicrosoftCommonLanguageRuntime", CultureInfo.CurrentUICulture); - String versionString = resourceManager.GetString("PlatformDependentAssemblyVersion", CultureInfo.CurrentUICulture); - - if ((clrProductName == null) || (versionString == null)) - { - return MissingDependencyType.Others; - } - - // Need to trim off the parameters in the ClickOnce strings: - // "{0} Version {1}" -> "Version" - // "Microsoft Common Language Runtime Version {0}" -> "Microsoft Common Language Runtime Version" - clrProductName = clrProductName.Replace("{0}", ""); - versionString = versionString.Replace("{0}", ""); - versionString = versionString.Replace("{1}", ""); - - string[] sentinelAssemblies = { - // The Original & "Only" - "WindowsBase", - // A reference to System.Core is what makes an application target .NET v3.5. - // Because WindowsBase still has v3.0.0.0, it's not the one that fails the platform requirements - // test when a v3.5 app is run on the v3 runtime. (This additional check added for v3 SP1.) - "System.Core", - // New sentinel assemblies for v3.5 SP1 (see the revision history) - "Sentinel.v3.5Client", "System.Data.Entity" }; - - // Parse the required version and trim it to major and minor only - string excpMsg = e.Message; - int index = excpMsg.IndexOf(versionString, StringComparison.Ordinal); - - if (index != -1) - { - // ClickOnce exception message is ErrorMessage_Platform* - // from clickonce/system.deployment.txt - version = String.Copy(excpMsg.Substring(index + versionString.Length)); - int indexToFirstDot = version.IndexOf(".", StringComparison.Ordinal); - int indexToSecondDot = version.IndexOf(".", indexToFirstDot+1, StringComparison.Ordinal); - - - if (excpMsg.IndexOf(clrProductName, StringComparison.Ordinal) != -1) - { - if (OperatingSystemVersionCheck.IsVersionOrLater(OperatingSystemVersion.Windows8)) - { - // CLR version are Major.Minor.Revision - // Defense in depth here in case CLR changes the version scheme to major + minor only - // and we might never see the third dot - int indexToThirdDot = version.IndexOf(".", indexToSecondDot+1, StringComparison.Ordinal); - if (indexToThirdDot != -1) - { - version = version.Substring(0, indexToThirdDot); - } - - } - else if (indexToSecondDot != -1) - { - // Defense in depth here in case Avalon change the version scheme to major + minor only - // and we might never see the second dot - version = version.Substring(0, indexToSecondDot); - } - - // prepend CLR to distinguish CLR version fwlink query - // vs. WinFX version query. - string clrVersion = String.Concat("CLR", version); - return (ConstructFwlinkUrl(clrVersion, out fwlinkUri) ? MissingDependencyType.CLR : MissingDependencyType.Others); - } - else - { - if (indexToSecondDot != -1) - { - // Defense in depth here in case Avalon change the version scheme to major + minor only - // and we might never see the second dot - version = version.Substring(0, indexToSecondDot); - } - - bool sentinelMissing = false; - foreach (string sentinelAssembly in sentinelAssemblies) - { - if (excpMsg.IndexOf(sentinelAssembly, StringComparison.OrdinalIgnoreCase) > 0) - { - sentinelMissing = true; - break; - } - } - if (!sentinelMissing) - { - version = String.Empty; - } - } - } - - return (ConstructFwlinkUrl(version, out fwlinkUri) ? MissingDependencyType.WinFX : MissingDependencyType.Others); - } - - - static internal void GetErrorTextFromException(Exception e, out string errorTitle, out string errorMessage) - { - errorTitle = String.Empty; - errorMessage = String.Empty; - - if (e == null) - { - errorTitle = SR.Get(SRID.CancelledTitle); - errorMessage = SR.Get(SRID.CancelledText); - } - else if (e is DependentPlatformMissingException) - { - errorTitle = SR.Get(SRID.PlatformRequirementTitle); - errorMessage = e.Message; - } - else if (e is InvalidDeploymentException) - { - errorTitle = SR.Get(SRID.InvalidDeployTitle); - errorMessage = SR.Get(SRID.InvalidDeployText); - } - else if (e is TrustNotGrantedException) - { - errorTitle = SR.Get(SRID.TrustNotGrantedTitle); - errorMessage = SR.Get(SRID.TrustNotGrantedText); - } - else if (e is DeploymentDownloadException) - { - errorTitle = SR.Get(SRID.DownloadTitle); - errorMessage = SR.Get(SRID.DownloadText); - } - else if (e is DeploymentException) - { - errorTitle = SR.Get(SRID.DeployTitle); - errorMessage = SR.Get(SRID.DeployText); - } - else - { - errorTitle = SR.Get(SRID.UnknownErrorTitle); - errorMessage = SR.Get(SRID.UnknownErrorText) + "\n\n" + e.Message; - } - } - - static internal bool ConstructFwlinkUrl(string version, out Uri fwlinkUri) - { - string fwlink = String.Empty; - fwlinkUri = null; - - if (version != String.Empty) - { - fwlink = String.Copy(fwlinkPrefix); - fwlink = String.Concat(fwlink, version); - fwlink = String.Concat(fwlink, fwlinkSuffix); - // Mitigate against proxy server caching, append today's day to the fwlink - // query. This matches the fwlink query from unmanaged bootwap functionality - // in IE7. - DateTime today = System.DateTime.Today; - fwlink = String.Concat(fwlink, today.Year.ToString()); - fwlink = String.Concat(fwlink, today.Month.ToString()); - fwlink = String.Concat(fwlink, today.Day.ToString()); - fwlinkUri = new Uri(fwlink); - return true; - } - - return false; - } - - #endregion - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/IHostService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/IHostService.cs deleted file mode 100644 index 86a836c5665..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/IHostService.cs +++ /dev/null @@ -1,51 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -//--------------------------------------------------------------------------- -// -// -// -// Description: -// Internal interface used for setting up the browser hosting -// environment -// -// -// -// -// -//--------------------------------------------------------------------------- - -using System; - -using System.Windows; -using System.Windows.Controls; -using System.Security; -namespace MS.Internal.AppModel -{ - // - // Internal interface used to set up the hosting environment for browser hosting - // - internal interface IHostService - { - // - // The client window passed in to host - // Needed for non-Avalon host scenarios - // when the winow needs re-positioning within the host's UI - // - RootBrowserWindowProxy RootBrowserWindowProxy - { - get; - } - - // - // get the HWND of the host - // We use this to parent our first Window to this window. - // - - IntPtr HostWindowHandle - { - get; - } - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/PresentationAppDomainManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/PresentationAppDomainManager.cs deleted file mode 100644 index e56dc0470e2..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/PresentationAppDomainManager.cs +++ /dev/null @@ -1,356 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -//--------------------------------------------------------------------------- -// -// -// -// Description: -// Implements a custom AppDomainManager. -// -//--------------------------------------------------------------------------- - -using System; -using System.Net; -using System.Reflection; -using System.Runtime.Remoting; -using System.Security; -using System.Security.Policy; -using System.Runtime.Hosting; -using System.Text; -using MS.Win32; -using MS.Internal; -using MS.Internal.AppModel; -using MS.Internal.Utility; -using MS.Utility; -using System.Diagnostics; -using System.Runtime.InteropServices; - -namespace System.Windows.Interop -{ - internal class PresentationHostSecurityManager : HostSecurityManager - { - internal static IntPtr ElevationPromptOwnerWindow; - - internal PresentationHostSecurityManager() - { - } - - public override ApplicationTrust DetermineApplicationTrust(Evidence applicationEvidence, Evidence activatorEvidence, TrustManagerContext context) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_DetermineApplicationTrustStart); - - ApplicationTrust trust; - Uri activationUri = GetUriFromActivationData(0); - bool isDebug = PresentationAppDomainManager.IsDebug ? true : GetBoolFromActivationData(1); - - BrowserInteropHelper.SetBrowserHosted(true); - - if (isDebug) - { - context.IgnorePersistedDecision = true; - context.Persist = false; - context.KeepAlive = false; - context.NoPrompt = true; - trust = base.DetermineApplicationTrust(applicationEvidence, activatorEvidence, context); - } - else - { - // Elevation prompt for permissions beyond the default for the security zone is allowed only - // in the Intranet and Trusted Sites zones (v4). - Zone hostEvidence = applicationEvidence.GetHostEvidence(); - context.NoPrompt = !(hostEvidence.SecurityZone == SecurityZone.Intranet || hostEvidence.SecurityZone == SecurityZone.Trusted); - /* - Now we need to convince the ClickOnce elevation prompt to use the browser's top-level window as - the owner in order to block the browser's UI (and our Cancel button) and ensure the prompt - stays on top. This is not easy. - * The prompt dialog is created without an explicit owner, on its own thread. - * There are layers of ClickOnce and pure security code before the UI is invoked (that's - TrustManagerPromptUIThread in System.Windows.Forms.dll). So, passing the owner window handle - would require some awkward plumbing. - - Since the dialog is shown on a separate thread, intercepting its creation or display is - complicated. An EVENT_OBJECT_CREATE hook can do it. But there is a cascade of thread - synchonization/access and window state issues if trying to set the owner on the fly. - - The cleanest solution ended up resorting to Detours. When not given an owner window, - SWF.Form.ShowDialog() uses the active window as owner. Since the call to GetActiveWindow() - occurs on a new thread, where there are no other windows, we couldn't just pre-set the owner - as the active window. So, we intercept the GetActiveWindow() call and return the browser's - top-level window. From that point on, everything in the WinForms dialog works as if the owner - was explicitly given. (And owner from a different thread or process is fully supported.) - - This condition is an optimization. - DetermineApplicationTrust() is called up to 3 times: twice in the default AppDomain and once - in the new one. Empirically, the elevation prompt is shown during the first call. - */ - bool forceOwner = !context.NoPrompt && ElevationPromptOwnerWindow != IntPtr.Zero; - if(forceOwner) - { - // The native code passes the DocObject top window, not the browser's top-level window, - // but we need exactly the top-level one. - IntPtr ownerWindow = UnsafeNativeMethods.GetAncestor( - new HandleRef(null, ElevationPromptOwnerWindow), NativeMethods.GA_ROOT); - SetFakeActiveWindow(ownerWindow); - ElevationPromptOwnerWindow = IntPtr.Zero; // to prevent further prompting - } - try - { - trust = base.DetermineApplicationTrust(applicationEvidence, activatorEvidence, context); - } - finally - { - if (forceOwner) - { - SetFakeActiveWindow(new IntPtr()); - } - } - } - - // Modify the permission grant set if necessary. - if (trust != null) - { - PermissionSet permissions = trust.DefaultGrantSet.PermissionSet; - - if (isDebug) - { - Uri debugSecurityZoneURL = GetUriFromActivationData(2); - if (debugSecurityZoneURL != null) - { - permissions = AddPermissionForUri(permissions, debugSecurityZoneURL); - } - } - - // CLR v4 breaking change: In some activation scenarios we get a ReadOnlyPermissionSet. - // This is a problem because: - // - Code may expect AppDomain.PermissionSet (or the old AppDomain.ApplicationTrust. - // DefaultGrantSet.PermissionSet) to return a mutable PermissionSet. - // - The ReadOnlyPermissionSet may have v2 and v3 assembly references--they are not 'unified' - // to the current framework version. This might confuse code doing more involved permission - // set comparisons or calculations. - // Workaround is to copy the ROPS to a regular one. - if (permissions is ReadOnlyPermissionSet) - { - permissions = new PermissionSet(permissions); - } - - trust.DefaultGrantSet.PermissionSet = permissions; - } - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_DetermineApplicationTrustEnd); - - return trust; - } - - [DllImport(ExternDll.PresentationHostDll)] - static extern void SetFakeActiveWindow(IntPtr hwnd); - - internal static PermissionSet AddPermissionForUri(PermissionSet originalPermSet, Uri srcUri) - { - PermissionSet newPermSet = originalPermSet; - if (srcUri != null) - { - Evidence evidence = new Evidence(); - evidence.AddHost(new Url(BindUriHelper.UriToString(srcUri))); // important: the parameter must be a UrL object not a UrI object - IMembershipCondition membership = new UrlMembershipCondition(BindUriHelper.UriToString(srcUri)); - CodeGroup group = (srcUri.IsFile) ? - (CodeGroup)new FileCodeGroup(membership, FileIOPermissionAccess.Read | FileIOPermissionAccess.PathDiscovery) - :(CodeGroup)new NetCodeGroup(membership); - PolicyStatement policy = group.Resolve(evidence); - if (!policy.PermissionSet.IsEmpty()) - { - newPermSet = originalPermSet.Union(policy.PermissionSet); - } - } - return newPermSet; - } - - private bool GetBoolFromActivationData(int index) - { - bool flag = false; // default - - if (AppDomain.CurrentDomain.SetupInformation.ActivationArguments != null && - AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData.Length > index) - { - if (AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData[index] == true.ToString()) - { - flag = true; - } - } - - return flag; - } - - private Uri GetUriFromActivationData(int index) - { - Uri uri = null; - - if (AppDomain.CurrentDomain.SetupInformation.ActivationArguments != null && - AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData.Length > index) - { - if (!string.IsNullOrEmpty(AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData[index])) - { - uri = new UriBuilder(AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData[index]).Uri; - } - } - - return uri; - } - } - - // This is the custom ApplicationActivator that will be returned by - // the PresentationAppDomainManager.ApplicationActivator property. - // CreateInstance will be called twice: the first time to create - // the new AppDomain, and the second time to create the app inside - // of the new AppDomain. - internal class PresentationApplicationActivator : System.Runtime.Hosting.ApplicationActivator - { - public override ObjectHandle CreateInstance(ActivationContext actCtx) - { - if (EventTrace.IsEnabled(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose)) - { - EventTrace.EventProvider.TraceEvent(EventTrace.Event.WpfHost_ApplicationActivatorCreateInstanceStart, - EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, - PresentationAppDomainManager.ActivationUri != null ? PresentationAppDomainManager.ActivationUri.ToString() : string.Empty); - } - - ObjectHandle oh; - if (PresentationAppDomainManager.ActivationUri != null) - { - oh = base.CreateInstance( - actCtx, - new string[] { - BindUriHelper.UriToString(PresentationAppDomainManager.ActivationUri), - PresentationAppDomainManager.IsDebug.ToString(), - (PresentationAppDomainManager.DebugSecurityZoneURL == null? - string.Empty - : PresentationAppDomainManager.DebugSecurityZoneURL.ToString())}); - } - else - { - oh = base.CreateInstance(actCtx); - } - bool returnAppDomain = false; - - if (AppDomain.CurrentDomain.ActivationContext != null && - AppDomain.CurrentDomain.ActivationContext.Identity.ToString().Equals(actCtx.Identity.ToString())) - { - returnAppDomain = true; - } - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_ApplicationActivatorCreateInstanceEnd); - - if (returnAppDomain) - { - // This is the new AppDomain. What we return here becomes the return value of - // InPlaceHostingManager.Execute(). - return new ObjectHandle(AppDomain.CurrentDomain); - } - else - { - return oh; - } - } - } - - // This is a custom AppDomainManager class we're using. We need to set the - // assembly name and class name in the environment for CLR to use it. We - // need to use this to detect new AppDomain creation. - internal class PresentationAppDomainManager : AppDomainManager - { - static PresentationAppDomainManager() - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_AppDomainManagerCctor); - } - - public PresentationAppDomainManager() - { - } - - public override ApplicationActivator ApplicationActivator - { - get - { - if (_appActivator == null) - _appActivator = new PresentationApplicationActivator(); - return _appActivator; - } - } - - public override void InitializeNewDomain(AppDomainSetup appDomainInfo) - { - //Hookup the assembly load event - _assemblyFilter = new AssemblyFilter(); - AppDomain.CurrentDomain.AssemblyLoad += new AssemblyLoadEventHandler(_assemblyFilter.FilterCallback); - } - - public override HostSecurityManager HostSecurityManager - { - get - { - if (_hostsecuritymanager == null) - { - _hostsecuritymanager = new PresentationHostSecurityManager(); - } - return _hostsecuritymanager; - } - } - - // Creates ApplicationProxyInternal. Creating it from Default domain will - // cause a stack walk for ReflectionPermission which will fail for partial - // trust apps. - internal ApplicationProxyInternal CreateApplicationProxyInternal() - { - return new ApplicationProxyInternal(); - } - - internal static AppDomain NewAppDomain - { - get { return _newAppDomain; } - set { _newAppDomain = value; } - } - - internal static bool SaveAppDomain - { - get { return _saveAppDomain; } - set - { - _saveAppDomain = value; - - // Allow garbage collection to happen. - _newAppDomain = null; - } - } - - internal static Uri ActivationUri - { - get { return _activationUri; } - set { _activationUri = value; } - } - - internal static Uri DebugSecurityZoneURL - { - get { return _debugSecurityZoneURL; } - set { _debugSecurityZoneURL = value; } - } - - internal static bool IsDebug - { - get { return _isdebug; } - set { _isdebug = value; } - } - - private static bool _isdebug = false; - private ApplicationActivator _appActivator = null; - - private HostSecurityManager _hostsecuritymanager = null; - - private static AppDomain _newAppDomain; - private static bool _saveAppDomain; - private static Uri _activationUri; - private static Uri _debugSecurityZoneURL; - - private AssemblyFilter _assemblyFilter; - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/RootBrowserWindow.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/RootBrowserWindow.cs deleted file mode 100644 index 7cc06737329..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/RootBrowserWindow.cs +++ /dev/null @@ -1,1140 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -//--------------------------------------------------------------------------- -// -// File: RootBrowserWindow.cs -// -// Description: This class will implement the hosting and bridging logic -// between the browser and Avalon. This will be the top -// level "frame" that hosts all content in IE. This class -// will not be public. -// -// -// -// -// -//--------------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Security; -using System.Text; -using System.Windows; -using System.Windows.Automation.Peers; -using System.Windows.Controls; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Interop; -using System.Windows.Media; -using System.Windows.Navigation; -using MS.Internal.Commands; -using MS.Internal.Controls; -using MS.Win32; - -//In order to avoid generating warnings about unknown message numbers and -//unknown pragmas when compiling your C# source code with the actual C# compiler, -//you need to disable warnings 1634 and 1691. (Presharp Documentation) -#pragma warning disable 1634, 1691 - - -namespace MS.Internal.AppModel -{ - - /// - /// - /// - internal sealed class RootBrowserWindow : NavigationWindow, IWindowService, IJournalNavigationScopeHost - { - //---------------------------------------------- - // - // Constructors - // - //---------------------------------------------- - #region Constructors - - - static RootBrowserWindow() - { - CommandHelpers.RegisterCommandHandler(typeof(RootBrowserWindow), ApplicationCommands.Print, - new ExecutedRoutedEventHandler(OnCommandPrint), new CanExecuteRoutedEventHandler(OnQueryEnabledCommandPrint)); - } - - /// - /// - /// - private RootBrowserWindow():base(true) - { - // Allow tabbing out to the browser - see KeyInputSite and OnKeyDown(). - - // IE 6 doesn't provide the necessary support; notice IsDownlevelPlatform covers Firefox too, - // hence the additional IsHostedInIE check. - // By checking for the negative top-level case, we allow to tab out of XBAPs hosted in an iframe; - // this support is enabled regardless of the browser we're on (to avoid browser-specifics here). - bool isIE6 = IsDownlevelPlatform && BrowserInteropHelper.IsHostedInIEorWebOC; - if (!(isIE6 && BrowserInteropHelper.IsAvalonTopLevel)) - { - SetValue(KeyboardNavigation.TabNavigationProperty, KeyboardNavigationMode.Continue); - SetValue(KeyboardNavigation.ControlTabNavigationProperty, KeyboardNavigationMode.Continue); - } - } - #endregion Constructors - - //---------------------------------------------- - // - // Protected Methods - // - //---------------------------------------------- - #region Protected Methods - - /// - /// Creates AutomationPeer () - /// - protected override AutomationPeer OnCreateAutomationPeer() - { - return new RootBrowserWindowAutomationPeer(this); - } - - protected override void OnInitialized(EventArgs args) - { - AddHandler(Hyperlink.RequestSetStatusBarEvent, new RoutedEventHandler(OnRequestSetStatusBar_Hyperlink)); - base.OnInitialized(args); - } - - protected override Size MeasureOverride(Size constraint) - { - return base.MeasureOverride(GetSizeInLogicalUnits()); - } - - protected override Size ArrangeOverride(Size arrangeBounds) - { - // Get the size of the avalon window and pass it to - // the base implementation. The return value tells the Size - // that we are occupying. Since, we are RBW we will occupy the - // entire available size and thus we don't care what our child wants. - base.ArrangeOverride(GetSizeInLogicalUnits()); - return arrangeBounds; - } - - protected override void OnStateChanged(EventArgs e) - { - } - - protected override void OnLocationChanged(EventArgs e) - { - } - - protected override void OnClosing(CancelEventArgs e) - { - } - - protected override void OnClosed(EventArgs e) - { - } - - protected override void OnContentRendered(EventArgs e) - { - base.OnContentRendered(e); - - // Posting READYSTATE_COMPLETE triggers the WebOC's DocumentComplete event. - // Media Center, in particular, uses this to make the WebOC it hosts visible. - if (!_loadingCompletePosted) - { - Browser.PostReadyStateChange(READYSTATE_COMPLETE); - _loadingCompletePosted = true; - } - } - - protected override void OnKeyDown(KeyEventArgs e) - { - // In browser apps, Ctrl+Tab switches tabs. F6 simulates it here. - if (e.Key == Key.F6 && (e.KeyboardDevice.Modifiers & ~ModifierKeys.Shift) == 0) - { - if (KeyboardNavigation.Navigate( - e.KeyboardDevice.FocusedElement as DependencyObject ?? this, - Key.Tab, e.KeyboardDevice.Modifiers | ModifierKeys.Control)) - { - e.Handled = true; - } - } - - if (!e.Handled) - { - base.OnKeyDown(e); - } - } - - #endregion Protected methods - - //---------------------------------------------- - // - // Internal Methods - // - //---------------------------------------------- - #region Internal Methods - - /// - /// Creates the RBW object and sets the Style property on it - /// to the correct value - /// - internal static RootBrowserWindow CreateAndInitialize() - { - RootBrowserWindow rbw = new RootBrowserWindow(); - rbw.InitializeRBWStyle(); - return rbw; - } - - internal override void CreateAllStyle() - { - Invariant.Assert(App != null, "RootBrowserWindow must be created in an Application"); - - IHostService ihs = (IHostService)App.GetService(typeof(IHostService)); - - Invariant.Assert(ihs!=null, "IHostService in RootBrowserWindow cannot be null"); - Invariant.Assert(ihs.HostWindowHandle != IntPtr.Zero, "IHostService.HostWindowHandle in RootBrowserWindow cannot be null"); - - //This sets the _ownerHandle correctly and will be used to create the _sourceWindow - //with the correct parent - this.OwnerHandle = ihs.HostWindowHandle; - this.Win32Style = NativeMethods.WS_CHILD | NativeMethods.WS_CLIPCHILDREN | NativeMethods.WS_CLIPSIBLINGS; - - } - - internal override HwndSourceParameters CreateHwndSourceParameters() - { - HwndSourceParameters parameters = base.CreateHwndSourceParameters(); - parameters.TreatAsInputRoot = true; - parameters.TreatAncestorsAsNonClientArea = true; - return parameters; - } - - /// - /// Override for SourceWindow creation. - /// Virtual only so that we may assert. - /// - internal override void CreateSourceWindowDuringShow() - { - Browser.OnBeforeShowNavigationWindow(); - - base.CreateSourceWindowDuringShow(); - Invariant.Assert(IsSourceWindowNull == false, "Failed to create HwndSourceWindow for browser hosting"); - - // _sourceWindowCreationCompleted specifies that HwndSource creation has completed. This is used - // to minimize the SetWindowPos calls from ResizeMove when Height/Width is set prior to calling - // show on RBW (this also occurs when Height/Width is set in the style of RBW) - _sourceWindowCreationCompleted = true; - - if (_rectSet) - { - _rectSet = false; - ResizeMove(_xDeviceUnits, _yDeviceUnits, _widthDeviceUnits, _heightDeviceUnits); - } - // The above window move (resize) operation causes message dispatching, which allows reentrancy - // from the browser, which can initiate premature shutdown. - if (IsSourceWindowNull) - return; - - SetUpInputHooks(); - - // - // While the RBW is created and shown, the Top Browser window should have already been created and shown, - // Browser doesn't notify this RBW of the activation status again unless user activates/deactivates the main - // window. It is time to transfer the Top Browser Window's activation status to this RBW so that user's - // code can get correct status through property IsActivate. - // - IntPtr topWindow = UnsafeNativeMethods.GetAncestor(new HandleRef(this, CriticalHandle), 2/*GA_ROOT*/); - Debug.Assert(topWindow != IntPtr.Zero); - IntPtr activeWindow = UnsafeNativeMethods.GetForegroundWindow(); - HandleActivate(activeWindow == topWindow); - } - - // No need to clear App.MainWindow for RBW case. It throws an exception if attempted - internal override void TryClearingMainWindow() - { - } - - internal override void CorrectStyleForBorderlessWindowCase() - { - } - - internal override void GetRequestedDimensions(ref double requestedLeft, ref double requestedTop, ref double requestedWidth, ref double requestedHeight) - { - requestedTop = 0; - requestedLeft = 0; - requestedWidth = this.Width; - requestedHeight = this.Height; - } - - internal override void SetupInitialState(double requestedTop, double requestedLeft, double requestedWidth, double requestedHeight) - { - // If RBW Height/Width was set before calling show in RBW, we need - // to update the browser with that size now - SetBrowserSize(); - SetRootVisual(); - } - - internal override int nCmdForShow() - { - return NativeMethods.SW_SHOW; - } - - internal override bool HandleWmNcHitTestMsg(IntPtr lParam, ref IntPtr refInt) - { - return false; - } - - internal override WindowMinMax GetWindowMinMax() - { - return new WindowMinMax(0, double.PositiveInfinity); - } - - // RBW overrides WmMoveChangedHelper default behavior where it calls - // either SetValue/CoerceValue on Top/Left DPs since that will - // throw an exception for RBW. Furthermore, in RBW, we don't want - // to fire LocationChanged event. - internal override void WmMoveChangedHelper() - { - } - - /// - /// Resizes and moves the RBW (which is a WS_CHILD window). This is called by - /// AppProxyInternal when the host callsbacks into it with the new size/location. - /// We need this internal since Height/Width/Top/Left on RBW govern the host'ss - /// properties. - /// - /// - /// The location of WS_CHILD window is relative to it parent window thus when the - /// browser moves it does not call this method since the relative position of this window - /// wrt the browser hasn't changed. - /// - /// New left of the RBW - /// New top of the RBW - /// New width of the RBW - /// New height of the RBW - internal void ResizeMove(int xDeviceUnits, int yDeviceUnits, int widthDeviceUnits, int heightDeviceUnits) - { - // _sourceWindowCreationCompleted specifies that HwndSource creation has completed. This is used - // to minimize the SetWindowPos calls from ResizeMove when Height/Width is set prior to calling - // show on RBW (this also occurs when Height/Width is set in the style of RBW). Thus, we want to - // resize the underlying avalon hwnd only after its creation is completed - if (_sourceWindowCreationCompleted == false) - { - _xDeviceUnits = xDeviceUnits; - _yDeviceUnits = yDeviceUnits; - _widthDeviceUnits = widthDeviceUnits; - _heightDeviceUnits = heightDeviceUnits; - - _rectSet = true; - - return; - } - - Invariant.Assert(IsSourceWindowNull == false, "sourceWindow cannot be null if _sourceWindowCreationCompleted is true"); - - HandleRef handleRef; - handleRef = new HandleRef( this, CriticalHandle ) ; - - UnsafeNativeMethods.SetWindowPos( handleRef , - NativeMethods.NullHandleRef, - xDeviceUnits, - yDeviceUnits, - widthDeviceUnits, - heightDeviceUnits, - NativeMethods.SWP_NOZORDER - | NativeMethods.SWP_NOACTIVATE - | NativeMethods.SWP_SHOWWINDOW); - } - - /// - /// This is called when the Title dependency property changes in the Window. - /// - internal override void UpdateTitle(string titleStr) - { - IBrowserCallbackServices ibcs = Browser; - if (ibcs != null) // null on shutdown - { - string title = PruneTitleString(titleStr); - - // It's not the end of the world if this fails. - // VS's browser in particular returns RPC_E_CALL_REJECTED. - // Not sure of other exceptions that might be thrown here, - // so keeping this scoped to what's been reported. - const int RPC_E_CALL_REJECTED = unchecked((int)0x80010001); - try - { - // SHOULD NOT CALL BASE; BASE IMPLEMENTS TEXT PROPERTY ON WINDOW - BrowserInteropHelper.HostBrowser.SetTitle(title); - } - catch (COMException e) - { - if (e.ErrorCode != RPC_E_CALL_REJECTED) - { - throw; - } - } - } - } - - /// - /// This is called by NavigationService to set the status bar content - /// for the browser - /// - /// - /// We propagate object.ToString() to the browser's status bar. - /// - internal void SetStatusBarText(string statusString) - { - if (BrowserInteropHelper.HostBrowser != null) // could be null if shutting down - { - BrowserInteropHelper.HostBrowser.SetStatusText(statusString); - } - } - - /// - /// Called to update Height of the browser. Currently, this method is called from - /// two places: - /// - /// 1) OnHeightInvalidated from window.cs - /// 2) SetBrowserSize in RBW - /// - internal override void UpdateHeight(double newHeightLogicalUnits) - { - Point sizeDeviceUnits = LogicalToDeviceUnits(new Point(0, newHeightLogicalUnits)); - uint heightDeviceUnits = (uint)Math.Round(sizeDeviceUnits.Y); - - if (BrowserInteropHelper.HostBrowser != null) - { - // - // Note: right now IE is clipping browser height to desktop size. - // However it should be clipped to available desktop size. See Windows OS Bug #1045038 - // The code below is to fix this for now. - // Even if IE's code is changed - likely we keep this as defense in-depth. - // - - uint maxHeightDeviceUnits = GetMaxWindowHeight(); - heightDeviceUnits = heightDeviceUnits > maxHeightDeviceUnits ? maxHeightDeviceUnits : heightDeviceUnits; - heightDeviceUnits = heightDeviceUnits < MIN_BROWSER_HEIGHT_DEVICE_UNITS ? MIN_BROWSER_HEIGHT_DEVICE_UNITS : heightDeviceUnits; - BrowserInteropHelper.HostBrowser.SetHeight(heightDeviceUnits); - } - } - - internal override void UpdateWidth(double newWidthLogicalUnits) - { - Point sizeDeviceUnits = LogicalToDeviceUnits(new Point(newWidthLogicalUnits, 0)); - uint widthDeviceUnits = (uint)Math.Round(sizeDeviceUnits.X); - - if (BrowserInteropHelper.HostBrowser != null) - { - // - // Note: right now IE is clipping browser width to desktop size. - // However it should be clipped to available desktop size. See Windows OS Bug #1045038 - // The code below is to fix this for now. - // Even if IE's code is changed - likely we keep this as defense in-depth. - // - uint maxWidthDeviceUnits = GetMaxWindowWidth(); - widthDeviceUnits = widthDeviceUnits > maxWidthDeviceUnits ? maxWidthDeviceUnits : widthDeviceUnits; - - widthDeviceUnits = widthDeviceUnits < MIN_BROWSER_WIDTH_DEVICE_UNITS ? MIN_BROWSER_WIDTH_DEVICE_UNITS : widthDeviceUnits; - BrowserInteropHelper.HostBrowser.SetWidth(widthDeviceUnits); - } - } - - /// - /// When being reloaded from history in the browser, we need to - /// set up the journal again - /// - /// - internal void SetJournalForBrowserInterop(Journal journal) - { - Invariant.Assert(journal != null, "Failed to get Journal for browser integration"); - base.JournalNavigationScope.Journal = journal; - } - - void IJournalNavigationScopeHost.OnJournalAvailable() - { - base.Journal.BackForwardStateChange += new EventHandler(HandleBackForwardStateChange); - } - - // For downlevel platforms, we don't have integration with the journal, so we have to - // use our own Journal. - bool IJournalNavigationScopeHost.GoBackOverride() - { - if (HasTravelLogIntegration) - { - if (BrowserInteropHelper.HostBrowser != null) - { - try - { - BrowserInteropHelper.HostBrowser.GoBack(); - } -#pragma warning disable 6502 // PRESharp - Catch statements should not have empty bodies - catch (OperationCanceledException) - { - // Catch the OperationCanceledException when the navigation is canceled. - // See comments in applicationproxyinternal._LoadHistoryStreamDelegate. - } -#pragma warning restore 6502 - } - return true; - } - return false; // Proceed with internal GoBack. - } - - // For downlevel platforms, we don't have integration with the journal, so we have to - // use our own Journal. - bool IJournalNavigationScopeHost.GoForwardOverride() - { - if (HasTravelLogIntegration) - { - if (BrowserInteropHelper.HostBrowser != null) - { - try - { - BrowserInteropHelper.HostBrowser.GoForward(); - } -#pragma warning disable 6502 // PRESharp - Catch statements should not have empty bodies - catch (OperationCanceledException) - { - // Catch the OperationCanceledException when the navigation is canceled. - // See comments in applicationproxyinternal._LoadHistoryStreamDelegate. - } -#pragma warning restore 6502 - } - return true; - } - return false; // Proceed with internal GoForward. - } - - internal override void VerifyApiSupported() - { - throw new InvalidOperationException(SR.Get(SRID.NotSupportedInBrowser)); - } - - internal override void ClearResizeGripControl(Control oldCtrl) - { - // don't do anything here since we do not support - // ResizeGrip for RBW - } - - internal override void SetResizeGripControl(Control ctrl) - { - // don't do anything here since we do not support - // ResizeGrip for RBW - } - - // This is called in weboc's static constructor. - internal void AddLayoutUpdatedHandler() - { - LayoutUpdated += new EventHandler(OnLayoutUpdated); - } - - internal void TabInto(bool forward) - { - TraversalRequest tr = new TraversalRequest( - forward ? FocusNavigationDirection.First : FocusNavigationDirection.Last); - MoveFocus(tr); - } - - #endregion Internal Methods - - //---------------------------------------------- - // - // Private Methods - // - //---------------------------------------------- - #region Private methods - /// - /// Sets the correct style property on the RBW object based on the - /// browser version - /// - private void InitializeRBWStyle() - { - // If we are on a downlevel platform, then we don't integrate with the browser's - // travellog, so we have to use our own Journal and supply our own navigation chrome. - if (!HasTravelLogIntegration) - { - SetResourceReference(StyleProperty, SystemParameters.NavigationChromeDownLevelStyleKey); - - // if the Template property is not defined in a custom style, the property system gets - // the Template property value for the NavigationWindow from the theme file. Since, - // we want to get the Template property value from the browser styles, we need to - // set the DefaultStyleKeyProperty here. - SetValue(DefaultStyleKeyProperty, SystemParameters.NavigationChromeDownLevelStyleKey); - } - else - { - SetResourceReference(StyleProperty, SystemParameters.NavigationChromeStyleKey); - - // if the Template property is not defined in a custom style, the property system gets - // the Template property value for the NavigationWindow from the theme file. Since, - // we want to get the Template property value from the browser styles, we need to - // set the DefaultStyleKeyProperty here. - SetValue(DefaultStyleKeyProperty, SystemParameters.NavigationChromeStyleKey); - } - } - - private void SetUpInputHooks() - { - IKeyboardInputSink sink; - - _inputPostFilter = new HwndWrapperHook(BrowserInteropHelper.PostFilterInput); - HwndSource hwndSource = base.HwndSourceWindow; - hwndSource.HwndWrapper.AddHookLast(_inputPostFilter); - - sink = (IKeyboardInputSink)hwndSource; - - Debug.Assert(sink.KeyboardInputSite == null); - sink.KeyboardInputSite = new KeyInputSite(new SecurityCriticalData(sink)); - } - - /// - /// Updates browser size if Height/Width is not set to default value (NaN). This - /// means that Height/Width was set prior to calling Show on RBW and we need to - /// propagate that to the browser. This method is called from SetupInitialize which - /// is called from CreateSourceWindowImpl - /// - private void SetBrowserSize() - { - Point requestedSizeDeviceUnits = LogicalToDeviceUnits(new Point(this.Width, this.Height)); - - // if Width was specified - if (!DoubleUtil.IsNaN(this.Width)) - { - // at this stage, ActualWidth/Height is not set since - // layout has not happened (it happens when we set the - // RootVisual of the HwndSource) - UpdateWidth(requestedSizeDeviceUnits.X); - } - - // if Height was specified - if (!DoubleUtil.IsNaN(this.Height)) - { - // at this stage, ActualWidth/Height is not set since - // layout has not happened (it happens when we set the - // RootVisual of the HwndSource) - UpdateHeight(requestedSizeDeviceUnits.Y); - } - } - - private string PruneTitleString(string rawString) - { - StringBuilder sb = new StringBuilder(); - bool inMiddleOfWord = false; - - for (int i=0; i < rawString.Length; i++) - { - if (Char.IsWhiteSpace(rawString[i]) == false) - { - sb.Append(rawString[i]); - inMiddleOfWord = true; - } - else - { - if (inMiddleOfWord == true) - { - sb.Append(' '); - inMiddleOfWord = false; - } - } - } - - // remove the last space if it exists - return sb.ToString().TrimEnd(' '); - } - - private void OnLayoutUpdated(object obj, EventArgs args) - { - try - { - VerifyWebOCOverlap(NavigationService); - } - finally - { - _webBrowserList.Clear(); - } - } - - private void VerifyWebOCOverlap(NavigationService navigationService) - { - for (int i = 0; i < navigationService.ChildNavigationServices.Count; i++) - { - NavigationService childNavService = (NavigationService)(navigationService.ChildNavigationServices[i]); - WebBrowser webBrowser = childNavService.WebBrowser; - if (webBrowser != null) - { - for (int j = 0; j < _webBrowserList.Count; j++) - { - // Note: We are using WebBrowser.BoundRect, which is relative to parent window. - // Since WebBrowsers are all siblings child windows right now, e.g., we don't allow WebOC inside - // Popup window, this is a better performed way. If we change that, we should make sure the rects - // to compare are relative to desktop. - Rect rect = Rect.Intersect(webBrowser.BoundRect, _webBrowserList[j].BoundRect); - // Only when the intersect rect's Width and Height are both bigger than 0, we consider them overlapping. - // Even when 2 edges are next to each other, it is considered as intersect by the Rect class. - if ((rect.Width > 0) && (rect.Height > 0)) - { - throw new InvalidOperationException(SR.Get(SRID.WebBrowserOverlap)); - } - } - _webBrowserList.Add(webBrowser); - } - else - { - VerifyWebOCOverlap(childNavService); - } - } - } - - /// - /// We are not using the CanGoBack/CanGoForward property change since that is fired only - /// if the value changes eg. if we had 3 entries in the backstack, then a back navigation - /// won't fire this since the value is still 'true' and has not changed. - /// What we need is the UpdateView() notification or the BackForwardState change - /// notification which is fired from UpdateView() of the Journal. - /// Trying to hook the event will create the journal even if there was no navigation - /// so just using an virtual override to do the work. - /// - private void HandleBackForwardStateChange(object sender, EventArgs args) - { - //Nothing to do for downlevel platform - if (!HasTravelLogIntegration) - return; - - IBrowserCallbackServices ibcs = Browser; - if (ibcs != null) - { - ibcs.UpdateBackForwardState(); - } - } - - - /// - /// Given a proposed width - and curWidth - return the MaxWidth the window can be opened to. - /// Used to prevent sizing of window > desktop bounds in browser. - /// - private uint GetMaxWindowWidth() - { - NativeMethods.RECT desktopArea = WorkAreaBoundsForNearestMonitor; - int browserLeft = BrowserInteropHelper.HostBrowser.GetLeft(); - uint curBrowserWidth = BrowserInteropHelper.HostBrowser.GetWidth(); - - uint availableWidth = (uint)(desktopArea.right - browserLeft); - uint maxWidth = availableWidth > curBrowserWidth ? availableWidth : curBrowserWidth; - return maxWidth; - } - - /// - /// Given a proposed height - and curHeight - return the MaxHeight the window can be opened to. - /// Used to prevent sizing of window > desktop bounds in browser. - /// - private uint GetMaxWindowHeight() - { - NativeMethods.RECT desktopArea = WorkAreaBoundsForNearestMonitor; - int browserTop = BrowserInteropHelper.HostBrowser.GetTop(); - uint curBrowserHeight = BrowserInteropHelper.HostBrowser.GetHeight(); - - uint availableHeight = (uint)(desktopArea.bottom - browserTop); - uint maxHeight = availableHeight > curBrowserHeight ? availableHeight : curBrowserHeight; - return maxHeight; - } - - - /// - ///For browser hosting cases, we get the rects through OLE activation before we create the - ///RootBrowserWindow. Even if SourceWindow or Handle are null, we can return the cached rects - /// - private Size GetSizeInLogicalUnits() - { - Size size; - - // Adding check for IsCompositionTargetInvalid - if (IsSourceWindowNull || IsCompositionTargetInvalid) - { - // return _widthDeviceUnits & _heightDeviceUnits if hwndsource is not yet available. - // We will resize when hwnd becomes available, because the DeviceToLogicalUnits calculation - // depends on hwnd being available. If it's not high dpi, the second resize will be optimized - // by layout system. - size = new Size(_widthDeviceUnits, _heightDeviceUnits); - } - else - { - // It's better to get WindowSize instead of doing WindowSize.Width & WindowSize.Height - // because WindowSize queries HwndSource. - size = WindowSize; - Point ptLogicalUnits = DeviceToLogicalUnits(new Point(size.Width, size.Height)); - size = new Size(ptLogicalUnits.X, ptLogicalUnits.Y); - } - - return size; - } - - private void OnRequestSetStatusBar_Hyperlink(object sender, RoutedEventArgs e) - { - RequestSetStatusBarEventArgs statusEvent = e as RequestSetStatusBarEventArgs; - - if ( statusEvent != null ) - { - SetStatusBarText(statusEvent.Text); - } - } - - /// - /// Prints the content of the App's MainWindow. The logic is that if the content is not visual but IInputElement - /// we will try to let it handle the command first. If it does not handle the print command we will get the corresponding - /// visual in the visual tree and use that to print. - /// - private static void OnCommandPrint(object sender, ExecutedRoutedEventArgs e) - { -#if !DONOTREFPRINTINGASMMETA - RootBrowserWindow rbw = sender as RootBrowserWindow; - Invariant.Assert(rbw != null); - - if (! rbw._isPrintingFromRBW) - { - Visual vis = rbw.Content as Visual; - - if (vis == null) - { - // If the content is not Visual but IInputElement, try to let it handle the command first. - // This is for the document scenario. Printing a document is different from printing a visual. - // Printing a visual is to print how it is rendered on screen. Printing a doc prints the full - // doc inculding the part that is not visible. There might be other functionalities that are - // specific for document. FlowDocument's viewer knows how to print the doc. - IInputElement target = rbw.Content as IInputElement; - - if (target != null) - { - // CanExecute will bubble up. If nobody between the content and rbw can handle it, - // It would call back on RBW again. Use _isPrintingFromRBW to prevent the loop. - rbw._isPrintingFromRBW = true; - try - { - if (ApplicationCommands.Print.CanExecute(null, target)) - { - ApplicationCommands.Print.Execute(null, target); - return; - } - } - finally - { - rbw._isPrintingFromRBW = false; - } - } - } - - // Let the user choose a printer and set print options. - PrintDialog printDlg = new PrintDialog(); - - // If the user pressed the OK button on the print dialog, we proceed - if (printDlg.ShowDialog() == true) - { - string printJobDescription = GetPrintJobDescription(App.MainWindow); - - // If the root is not visual and does not know how to print itself, we find the - // corresponding visual and use that to print. - if (vis == null) - { - INavigatorImpl navigator = rbw as INavigatorImpl; - Invariant.Assert(navigator != null); - - vis = navigator.FindRootViewer(); - Invariant.Assert(vis != null); - } - - // Area we can print to for the chosen printer - Rect imageableRect = GetImageableRect(printDlg); - - // We print Visuals aligned with the top/left corner of the printable area. - // We do not attempt to print very large Visuals across multiple pages. - // Any portion that doesn't fit on a single page will get cropped by the - // print system. - - // Used to draw our visual into another visual for printing purposes - VisualBrush visualBrush = new VisualBrush(vis); - visualBrush.Stretch = Stretch.None; - - // Visual we will print - containing a rectangle the size of our - // original Visual but offset into the printable area - DrawingVisual drawingVisual = new DrawingVisual(); - DrawingContext context = drawingVisual.RenderOpen(); - context.DrawRectangle(visualBrush, - null, - new Rect(imageableRect.X, - imageableRect.Y, - vis.VisualDescendantBounds.Width, - vis.VisualDescendantBounds.Height)); - context.Close(); - - printDlg.PrintVisual(drawingVisual, printJobDescription); - } - } -#endif // DONOTREFPRINTINGASMMETA - } - - private static void OnQueryEnabledCommandPrint(object sender, CanExecuteRoutedEventArgs e) - { - RootBrowserWindow rbw = sender as RootBrowserWindow; - Invariant.Assert(rbw != null); - - if ((!e.Handled) && (!rbw._isPrintingFromRBW)) - { - // While we could print null it doesn't really make sense to do so - e.CanExecute = rbw.Content != null; - } - } - -#if !DONOTREFPRINTINGASMMETA - private static Rect GetImageableRect(PrintDialog dialog) - { - Rect imageableRect = Rect.Empty; - - Invariant.Assert(dialog != null, "Dialog should not be null."); - - System.Printing.PrintQueue queue = null; - System.Printing.PrintCapabilities capabilities = null; - System.Printing.PageImageableArea imageableArea = null; - - // This gets the PringDocumentImageableArea.OriginWidth/OriginHeight - // of the PrintQueue the user chose in the dialog. - queue = dialog.PrintQueue; - if (queue != null) - { - capabilities = queue.GetPrintCapabilities(); - } - - if (capabilities != null) - { - imageableArea = capabilities.PageImageableArea; - if (imageableArea != null) - { - imageableRect = new Rect(imageableArea.OriginWidth, - imageableArea.OriginHeight, - imageableArea.ExtentWidth, - imageableArea.ExtentHeight); - } - } - - // If for any reason we couldn't get the actual printer's values - // we fallback to a constant and the values available from the - // PrintDialog. - if (imageableRect == Rect.Empty) - { - imageableRect = new Rect(NON_PRINTABLE_MARGIN, - NON_PRINTABLE_MARGIN, - dialog.PrintableAreaWidth, - dialog.PrintableAreaHeight); - } - - return imageableRect; - } -#endif - - /// - /// Generate the title of the print job for a given Window. - /// - private static string GetPrintJobDescription(Window window) - { - Invariant.Assert(window != null, "Window should not be null."); - - string description = null; - string pageTitle = null; - - // Get the window title - string windowTitle = window.Title; - if (windowTitle != null) - { - windowTitle = windowTitle.Trim(); - } - - // Get the page title, if available - Page page = window.Content as Page; - if (page != null) - { - pageTitle = page.Title; - if (pageTitle != null) - { - pageTitle = pageTitle.Trim(); - } - } - - // If window and page title are available, use them together, - // otherwise use which ever is available - if (!String.IsNullOrEmpty(windowTitle)) - { - if (!String.IsNullOrEmpty(pageTitle)) - { - description = SR.Get(SRID.PrintJobDescription, windowTitle, pageTitle); - } - else - { - description = windowTitle; - } - } - - // No window title so use the page title on its own - if (description == null && !String.IsNullOrEmpty(pageTitle)) - { - description = pageTitle; - } - - // If neither window or page titles are available, try and use - // the source URI for the content - if (description == null && BrowserInteropHelper.Source != null) - { - Uri source = BrowserInteropHelper.Source; - if (source.IsFile) - { - description = source.LocalPath; - } - else - { - description = source.ToString(); - } - } - - // If no other option, use a localized constant - if (description == null) - { - description = SR.Get(SRID.UntitledPrintJobDescription); - } - - return description; - } - - - #endregion Private methods - - //---------------------------------------------- - // - // Private Properties - // - //---------------------------------------------- - #region Private properties - private static Application App - { - get { return Application.Current; } - } - - - private static IBrowserCallbackServices Browser - { - get - { - // There will be no IBrowserCallbackServices available in some situations, e.g., during shutdown - IBrowserCallbackServices ibcs = (App == null ? null : App.BrowserCallbackServices); - return ibcs; - } - } - - private bool IsDownlevelPlatform - { - get - { - if (!_isDownlevelPlatformValid) - { - IBrowserCallbackServices ibcs = Browser; - _isDownlevelPlatform = (ibcs != null) ? ibcs.IsDownlevelPlatform() : false; - - _isDownlevelPlatformValid = true; - } - - return _isDownlevelPlatform; - } - } - - internal bool HasTravelLogIntegration - { - get - { - return !IsDownlevelPlatform && BrowserInteropHelper.IsAvalonTopLevel; - } - } - - #endregion Private properties - - //---------------------------------------------- - // - // Private Classes - // - //---------------------------------------------- - #region Private Classes - - /// - /// This class is used to print objects which are not directly supported by XpsDocumentWriter. - /// It's sole purpose is to make a non-abstract version of Visual. - /// - private class PrintVisual : ContainerVisual { } - - - private class KeyInputSite : IKeyboardInputSite - { - internal KeyInputSite(SecurityCriticalData sink) - { - _sink = sink; - } - - void IKeyboardInputSite.Unregister() - { - _sink = new SecurityCriticalData(null); - } - - IKeyboardInputSink IKeyboardInputSite.Sink - { - get { return _sink.Value; } - } - - bool IKeyboardInputSite.OnNoMoreTabStops(TraversalRequest request) - { - return Browser.TabOut(request.FocusNavigationDirection == FocusNavigationDirection.Next); - // i. Tabbing-in is handled by ApplicationProxyInternal. - } - - SecurityCriticalData _sink; - }; - - #endregion Private Classes - - - //---------------------------------------------- - // - // Private Members - // - //---------------------------------------------- - #region private members - - //Cache the values until the HwndSourceWindow is created - private int _xDeviceUnits, _yDeviceUnits, _widthDeviceUnits, _heightDeviceUnits; - private bool _rectSet; - - private bool _isPrintingFromRBW; - private bool _isDownlevelPlatformValid; - private bool _isDownlevelPlatform; - private bool _sourceWindowCreationCompleted; - - private List _webBrowserList = new List(); - - /// - /// The event delegate has to be stored because HwndWrapper keeps only a weak reference to it. - /// - private HwndWrapperHook _inputPostFilter; - - private bool _loadingCompletePosted; - const int READYSTATE_COMPLETE = 4; - - // Fallback constant for the size of non-printable margin. This is used if - // we cant retrieve the actual size from the PrintQueue. - private const int NON_PRINTABLE_MARGIN = 15; - - // - // Setting these as the min-browser width & height. - // Note that we can't use User's min window-width & height - these are specifically about browser window. - // - private const int MIN_BROWSER_WIDTH_DEVICE_UNITS = 200; - - private const int MIN_BROWSER_HEIGHT_DEVICE_UNITS = 200; - #endregion private members - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/RootBrowserWindowProxy.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/RootBrowserWindowProxy.cs deleted file mode 100644 index c4e597c7990..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/RootBrowserWindowProxy.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -//--------------------------------------------------------------------------- -// -// File: RootBrowserWindowProxy.cs -// -// Description: -// -// Created: 07/01/2004 -// -// -// -//--------------------------------------------------------------------------- - -using System; -using System.Security; -using MS.Internal; -using MS.Internal.PresentationFramework; - -namespace MS.Internal.AppModel -{ - class RootBrowserWindowProxy : MarshalByRefObject - { - #region Constructors - - internal RootBrowserWindowProxy(RootBrowserWindow rbw) - { - _rbw = rbw; - } - - #endregion Constructors - - #region Internal Properties - - internal RootBrowserWindow RootBrowserWindow - { - get - { - return _rbw; - } - } - - #endregion Internal Properties - - #region Internal methods - - internal void TabInto(bool forward) - { - _rbw.TabInto(forward); - } - - #endregion - - #region Private Data - - private RootBrowserWindow _rbw; - - #endregion Private Data - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/XappLauncher.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/XappLauncher.cs deleted file mode 100644 index 1e98f411307..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/XappLauncher.cs +++ /dev/null @@ -1,1227 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.Deployment.Application; -using System.Runtime.Remoting; -using System.Security; -using System.Security.Policy; -using System.Xml; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Interop; -using System.Windows.Navigation; -using System.Windows.Threading; -using System.Runtime.InteropServices; -using System.Diagnostics; -using MS.Internal; -using MS.Internal.PresentationFramework; -using MS.Internal.Utility; -using Microsoft.Internal.DeploymentUI; -using Microsoft.Win32; -using System.Reflection; -using MS.Utility; -using System.Windows.Input; -using System.Threading; - -namespace MS.Internal.AppModel -{ - internal class XappLauncherApp : Application - { - internal XappLauncherApp(Uri deploymentManifest, string applicationId, - IBrowserCallbackServices browser, DocObjHost.ApplicationRunnerCallback applicationRunner, - INativeProgressPage nativeProgressPage, - string progressPageAssembly, string progressPageClass, string errorPageAssembly, string errorPageClass) - { - _deploymentManifest = deploymentManifest; - _applicationId = applicationId; - _browser = browser; - _applicationRunnerCallback = applicationRunner; - _fwlinkUri = null; - _requiredCLRVersion = null; - this.Startup += new StartupEventHandler(XappLauncherApp_Startup); - this.Exit += new ExitEventHandler(XappLauncherApp_Exit); - this.Navigated += new NavigatedEventHandler(XappLauncherApp_Navigated); - - _nativeProgressPage = nativeProgressPage; - _progressPageAssembly = progressPageAssembly; - _progressPageClass = progressPageClass; - _errorPageAssembly = errorPageAssembly; - _errorPageClass = errorPageClass; - } - - void OnCommandRefresh(object sender, RoutedEventArgs e) - { - HandleRefresh(); - } - - void OnCommandStop(object sender, RoutedEventArgs e) - { - UserStop(); - } - - void XappLauncherApp_Startup(object sender, StartupEventArgs e) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_XappLauncherAppStartup); - - CreateApplicationIdentity(); - if (_identity != null) - { - TryApplicationIdActivation(); - } - else - { - TryUriActivation(); - } - } - - void XappLauncherApp_Exit(object sender, ExitEventArgs e) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_XappLauncherAppExit, _runApplication); - - Invariant.Assert(!_isInAsynchronousOperation, - "Async downloading should have been canceled before XappLauncherApp exits."); - - RunApplicationAsyncCallback(null); - - _browser = null; - _applicationRunner = null; - _applicationRunnerCallback = null; - } - - - void XappLauncherApp_Navigated(object sender, NavigationEventArgs e) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_XappLauncherAppNavigated); - - if (IsShuttingDown) - return; - - if (!_commandBindingsRegistered) - { - _commandBindingsRegistered = true; - - // These bindings handle the commands sent by the browser when the stop/refresh buttons are pressed. If nothing in the - // page has focus, they will be sent directly to the window. - // SP2 Update: DocObjHost.ExecCommand() now also handles these commands, either directly from - // the browser or from the native progress page. - MainWindow.CommandBindings.Add(new CommandBinding(NavigationCommands.BrowseStop, new ExecutedRoutedEventHandler(OnCommandStop))); - MainWindow.CommandBindings.Add(new CommandBinding(NavigationCommands.Refresh, new ExecutedRoutedEventHandler(OnCommandRefresh))); - } - - NavigationWindow navWin = GetAppWindow(); - Invariant.Assert(navWin != null, "A RootBrowserWindow should have been created."); - while (navWin.CanGoBack) - { - navWin.RemoveBackEntry(); - } - } - - void StartAsynchronousOperation() - { - Debug.Assert(!_isInAsynchronousOperation && !IsCanceledOrShuttingDown); - _isInAsynchronousOperation = true; - ChangeBrowserDownloadState(_isInAsynchronousOperation); - } - - void ClearAsynchronousOperationStatus() - { - _isInAsynchronousOperation = false; - ChangeBrowserDownloadState(_isInAsynchronousOperation); - } - - - private object UserRefresh(object unused) - { - HandleRefresh(); - return null; - } - - internal override void PerformNavigationStateChangeTasks( - bool isNavigationInitiator, bool playNavigatingSound, NavigationStateChange state) - { - // Do not play sounds or start and stop the globe on when navigations - // occur because the progress page is merely an enhanced visual experience - // during the actual navigation to the application. Conceptually it should - // appear as something that happens during navigation and not a series of - // discrete navigations. - - // We do need to ensure that the Stop and Refresh buttons are in the correct state - // while downloading the app. - if (isNavigationInitiator && state == NavigationStateChange.Completed) - { - UpdateBrowserCommands(); - } - } - - // This function gets called when the browser refresh button in clicked. - // This'll cause the browser to navigate the address bar - internal void HandleRefresh() - { - lock (_lockObject) // we do this in case the refresh button is getting clicked rapidly, before the navigation happens - { - if (!_refreshing) - { - _refreshing = true; - BrowserCallbackServices.DelegateNavigation(_deploymentManifest.ToString(), null, null); - } - } - } - - private void ChangeBrowserDownloadState(bool newState) - { - // start or stop waving the flag - // When shutting down, which may happen during deployment, IBrowserCallbackServices may become - // unavailable. Calling ChangeBrowserDownloadState(false) should not trigger an exception then. - try - { - _browser.ChangeDownloadState(newState); - } - catch (Exception ex) - { - if (!(ex is InvalidComObjectException || ex is COMException || ex is InvalidOperationException) || - newState || !IsShuttingDown) - { - throw; - } - } - } - - private void TryApplicationIdActivation() - { - Dispatcher.Invoke( - DispatcherPriority.Input, - new DispatcherOperationCallback(DoDirectActivation), - null); - } - - private void TryUriActivation() - { - if(_hasTriedUriActivation) - { - Shutdown(); - } - else - { - _hasTriedUriActivation = true; - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Info, EventTrace.Event.WpfHost_FirstTimeActivation); - - // IPHM created on a worker thread. See threading comment on _hostingManager. - ThreadStart d = delegate - { - _hostingManager = new InPlaceHostingManager(_deploymentManifest); - - // Continue on the UI thread. - Dispatcher.BeginInvoke(DispatcherPriority.Normal, new SendOrPostCallback(delegate - { - // Ordering is important here - downloading the manifest is done asynchronously - // so can be started before we spend time setting up the UI. This saves us some - // time - especially during cold-start scenarios. - - DoGetManifestAsync(); - - DoDownloadUI(); - }), null); - }; - d.BeginInvoke(null, null); - } - } - - private object DoDirectActivation(object unused) - { - if (IsCanceledOrShuttingDown) - return null; - - try - { - // Verify that this app is actually cached. This is because the call to - // CreatePartialActivationContext can succeed when we don't want it to; - // it appears to be insensitive to some parts of the ApplicationIdentity, - // or it tries to make things work when they really should fail. Looking - // at the UserApplicationTrusts does a better comparison. - if (ApplicationSecurityManager.UserApplicationTrusts[_identity.ToString()] != null) - { - _context = System.ActivationContext.CreatePartialActivationContext(_identity); - RunApplicationAsync(ExecuteDirectApplication); - } - else - { - TryUriActivation(); - } - } - catch(Exception exception) - { - // Delete the cached trust decision to force going down the full ClickOnce path next time - DeleteCachedApplicationTrust(_identity); - - // Fatal error like NullReferenceException and SEHException should not be ignored. - if (exception is NullReferenceException || exception is SEHException) - { - throw; - } - else - { - TryUriActivation(); - } - } - - return null; - } - - private bool ExecuteDirectApplication() - { - _runApplication = false; - - try - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_ClickOnceActivationStart, KnownBoxes.BooleanBoxes.TrueBox); - ObjectHandle oh = Activator.CreateInstance(_context); - GotNewAppDomain(oh); - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_ClickOnceActivationEnd); - - Shutdown(); - - return true; - } - catch (Exception exception) - { - // Delete the cached trust decision to force going down the full ClickOnce path next time - DeleteCachedApplicationTrust(_identity); - - // Fatal error like NullReferenceException and SEHException should not be ignored. - if (exception is NullReferenceException || exception is SEHException) - { - throw; - } - else - { - TryUriActivation(); - } - } - - return false; - } - - void GotNewAppDomain(ObjectHandle oh) - { - Invariant.Assert(PresentationAppDomainManager.SaveAppDomain); - - // In stress situations or with a corrupt application store, ClickOnce may fail to return us - // an AppDomain, without throwing an exception. This might also happen if something goes wrong - // with ApplicationActivator's use of our custom AppDomainManager - if (oh != null) - { - AppDomain newDomain = (AppDomain)oh.Unwrap(); - if (newDomain != null) - { - PresentationAppDomainManager.NewAppDomain = newDomain; - return; - } - } - // Note that DocObjHost enables the unhandled exception page just before trying to run the - // application, so this exception message should be displayed to the user (except if we are - // trying direct activation, in which case the exception is caught and we fall back to the full - // IPHM activation). - throw new ApplicationException(SR.Get(SRID.AppActivationException)); - } - - private void DoGetManifestAsync() - { - if (IsCanceledOrShuttingDown) - return; - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_DownloadDeplManifestStart); - - StartAsynchronousOperation(); - SetStatusText(SR.Get(SRID.HostingStatusDownloadAppInfo)); - - _hostingManager.GetManifestCompleted += new EventHandler(GetManifestCompleted); - // Possible reentrancy! When making the outgoing calls to the browser to update its - // status (above), a pending incoming call can be dispatched. This may be OLECMDID_STOP, - // which would lead to calling UserStop(), which makes IPHM unusable. - if (!IsCanceledOrShuttingDown) - { - Debug.Assert(_isInAsynchronousOperation); - _hostingManager.GetManifestAsync(); - } - } - - private object GetCustomPage(string pageAssemblyName, string pageClassName) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_GetDownloadPageStart, pageClassName); - - object customPage; - try - { - // Uses custom progress page - // If the assembly is not specified, use PresentationUI. - Assembly customPageAssembly = string.IsNullOrEmpty(pageAssemblyName) ? typeof(TenFeetInstallationProgress).Assembly : Assembly.Load(pageAssemblyName); - customPage = customPageAssembly.CreateInstance(pageClassName); - } - catch - { - customPage = null; - } - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_GetDownloadPageEnd); - - return customPage; - } - - void GetManifestCompleted(object sender, GetManifestCompletedEventArgs e) - { - // Continue through a Background priority work item to ensure that the progress page has loaded-- - // we need at least the javascript functions to be available to call. Trident uses a sequence of - // message-based callbacks to do its work. Once we ensure the first callback is enqueued before - // the main thread starts pumping messages again, the sequence will complete before the Background - // priority operation is dispatched. DoDownloadUI() is called right after DoGetManifestAsync(), so - // the HTML loading will start before we return to the message loop. - Dispatcher.BeginInvoke(DispatcherPriority.Background, new DispatcherOperationCallback(DoGetManifestCompleted), e); - } - - private object DoGetManifestCompleted(object e) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_DownloadDeplManifestEnd); - - GetManifestCompletedEventArgs args = (GetManifestCompletedEventArgs)e; - _getManifestCompletedEventArgs = args; - - // Race condition: UserStop() can be called after InPlaceHostingManager has completed - // the manifest downloading but before this callback is called. - bool canceled = _canceled || args.Cancelled; - - ClearAsynchronousOperationStatus(); - - if (IsShuttingDown) - return null; - if (args.Error != null) - { - // If the async operation failed, it is invalid to request the - // SupportUri so we simply pass in null. - HandleError(args.Error, args.LogFilePath, null, null); - return null; - } - if (canceled) - { - HandleCancel(); - return null; - } - - // args.ApplicationIdentity throws if the operation has been canceled. That's why the above check has - // to come first. - _identity = args.ApplicationIdentity; - - if (_progressPage != null) - { - _progressPage.ApplicationName = args.ProductName; - - // GetManifestCompletedEventArgs.PublisherName doesn't exist. - // DevDiv bug 166088 tracks this. - // The retrieval below takes surprisingly little time: < 1 ms. - XmlReader rdr = args.DeploymentManifest; - rdr.MoveToContent(); - if (rdr.LocalName == "assembly") - { - rdr.ReadStartElement(); - while(rdr.NodeType != XmlNodeType.EndElement) - { - if(rdr.LocalName == "description") - { - string publisher = rdr.GetAttribute("publisher", "urn:schemas-microsoft-com:asm.v2"); - if (!string.IsNullOrEmpty(publisher)) - { - _progressPage.PublisherName = publisher; - } - break; - } - rdr.Skip(); - } - } - } - - // - // Start asynchronous application downloading - // - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_DownloadApplicationStart); - ShowDownloadingStatusMessage(); - StartAsynchronousOperation(); - // Possible reentrancy! When making the outgoing calls to the browser to update its - // status (above), a pending incoming call can be dispatched. This may be OLECMDID_STOP, - // which would lead to calling UserStop(), which makes IPHM unusable. - if (IsCanceledOrShuttingDown) - return null; - _hostingManager.DownloadProgressChanged += new EventHandler(DownloadProgressChanged); - _hostingManager.DownloadApplicationCompleted += new EventHandler(DownloadApplicationCompleted); - _hostingManager.DownloadApplicationAsync(); - - // Cold-start optimization: While async downloading is underway, do AssertApplicationRequirements. - // AAR takes 0.8-1.5+ seconds on cold start because it loads all assemblies from which permission - // types are referenced. - Dispatcher.BeginInvoke(DispatcherPriority.Input, - new DispatcherOperationCallback(AssertApplicationRequirementsAsync), null); - _assertAppRequirementsEvent = new ManualResetEvent(false); - - return null; - } - - void ShowDownloadingStatusMessage() - { - SetStatusText(SR.Get(SRID.HostingStatusDownloadApp)); - } - - object AssertApplicationRequirementsAsync(object unused) - { - if (IsCanceledOrShuttingDown) - return null; - - if (CheckAccess()) // initial call by Dispatcher? - { // Do a callback to a worker thread - // Status bar is set on the main thread (here) to avoid switching. - SetStatusText(SR.Get(SRID.HostingStatusVerifying)); - - // Creating an STA thread to get CLR's 'selectively permeable' managed locks. This is needed to - // enable the dispatching of the window event hook calls needed to intercept the showing of the - // ClickOnce elevation prompt. See PresentationAppDomainManager.DetermineApplicationTrust(). - Thread thread = new Thread(() => AssertApplicationRequirementsAsync(null)); - thread.SetApartmentState(ApartmentState.STA); - thread.Name = "IPHM.AAR thread"; - thread.Start(); - } - else // on a worker thread - { - try - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_AssertAppRequirementsStart); - - _hostingManager.AssertApplicationRequirements(); - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_AssertAppRequirementsEnd); - - // Switch to the main thread to update the status message. This is necessary because the - // native IBCS and INativeProgressPage interfaces are not marshalable. - Dispatcher.BeginInvoke(DispatcherPriority.Normal, new DispatcherOperationCallback( - delegate(object unused3) - { - if (_isInAsynchronousOperation) - { - ShowDownloadingStatusMessage(); - } - return null; - }), null); - } - catch (Exception exception0) - { - if (exception0.GetType() == typeof(InvalidOperationException) && - exception0.Source == "System.Deployment") - { // "No further operations are possible with this instance": - // This condition can occur when IPHM.AssertApplicationRequirements() is called after application - // downloading has failed. That error may or may not have been reported to the main thread yet. - // Presumably, it is the "real" error that failed deployment and should be reported to the user. - // That's why no further handling is done here, and _assertAppRequirementsFailed is not set. - } - else - { - _assertAppRequirementsFailed = true; - - // Note that an exception allowed to escape from here will be caught by the thread-pool manager. - // That's why all further processing is moved to the main thread. - Dispatcher.BeginInvoke(DispatcherPriority.Send, new DispatcherOperationCallback( - delegate(object exceptionObj) - { - Exception exception = (Exception)exceptionObj; - if (CriticalExceptions.IsCriticalException(exception)) - { // Wrap the exception object in order to preserve the original callstack. - throw new DeploymentException(SR.Get(SRID.UnknownErrorText), exception); - } - - GetManifestCompletedEventArgs args = _getManifestCompletedEventArgs; - string version = null; - if (exception is TrustNotGrantedException) - { - version = GetMissingCustomPermissionVersion(args.ApplicationManifest); - if (!string.IsNullOrEmpty(version)) - { - exception = new DependentPlatformMissingException(); - } - } - - HandleError(exception, args.LogFilePath, args.SupportUri, version); - return null; - }), exception0); - } - } - finally - { - // Synchronize with DoDownloadApplicationCompleted(). [See explanation there.] - _assertAppRequirementsEvent.Set(); - } - } - return null; - } - - /// Nested message pumping should not be allowed within this method. See the synchronization - /// issue with deployment manifest downloading explained in GetManifestCompleted(). - /// - private void DoDownloadUI() - { - // ASSUMES ALREADY IN CORRECT CONTEXT - - // Note: The custom progress page support was provided for Media Center. Since MC has - // deprecated XBAP support, we'll likely counter-deprecate. - - bool usingCustomPage = true; - if (_progressPageClass != null) - { - _progressPage = GetCustomPage(_progressPageAssembly, _progressPageClass) as IProgressPage; - } - // If we failed to get a custom page, or didn't even try, use our default. - if (_progressPage == null) - { - usingCustomPage = false; - Invariant.Assert(_nativeProgressPage != null); - _progressPage = new NativeProgressPageProxy(_nativeProgressPage); - } - - _progressPage.DeploymentPath = _deploymentManifest; - _progressPage.StopCallback = new DispatcherOperationCallback(UserStop); - _progressPage.RefreshCallback = new DispatcherOperationCallback(UserRefresh); - - // A "custom" page is a managed one. It needs to be loaded in the RootBrowserWindow. - // The RBW is not created in the default AppDomain otherwise. This is what saves significantly - // from the startup time, especially on cold start. - if (usingCustomPage) - { - BrowserWindow.Navigate(_progressPage); - } - else - { - // Note: The native progress page may have been shown, due to the cold start heuristic. - _nativeProgressPage.Show(); - //Q: What ever hides the native progress page? - //A: IBrowserCallbackServices.OnBeforeShowNavigationWindow() (in CColeDocument). - // This arrangement covers the RBW being shown in either AppDomain. (In the default AppDomain - // we may have to show the deployment failed/canceled page or a custom progress page.) - } - } - - private void HandleError(Exception exception, string logFilePath, Uri supportUri, string requiredWpfVersion) - { - - ClearAsynchronousOperationStatus(); - - // Delete the cached trust decision to force going down the full ClickOnce path next time - DeleteCachedApplicationTrust(_identity); - - // If we are being shut down by the browser, don't do anything else. - if (IsShuttingDown) - { - AbortActivation(); - return; - } - - // ASSUMES ALREADY IN CORRECT CONTEXT - SetStatusText(SR.Get(SRID.HostingStatusFailed)); - string version = String.Empty; - MissingDependencyType getWinFXReq = MissingDependencyType.Others; - - if (exception is DependentPlatformMissingException) - { - if (requiredWpfVersion != null) - { - getWinFXReq = MissingDependencyType.WinFX; - version = requiredWpfVersion; - DeploymentExceptionMapper.ConstructFwlinkUrl(version, out _fwlinkUri); - _requiredCLRVersion = ClrVersionFromWinFXVersion(version); - } - else - { - getWinFXReq = DeploymentExceptionMapper.GetWinFXRequirement(exception, _hostingManager, out version, out _fwlinkUri); - switch(getWinFXReq) - { - case MissingDependencyType.WinFX: - _requiredCLRVersion = ClrVersionFromWinFXVersion(version); - break; - case MissingDependencyType.CLR: - _requiredCLRVersion = version; - break; - default: - break; - } - } - } - - if (String.IsNullOrEmpty(_requiredCLRVersion)) - { - // This scenario is possible of we have a valid WPF version that we could not map to known CLR version - // We have no scheme that can reliably predict how to install future versions of the framework. - // This code prevents us from offering an FWLink or activation button for future versions of the Framework - getWinFXReq = MissingDependencyType.Others; - } - - string errorTitle, errorMessage; - - switch(getWinFXReq) - { - case MissingDependencyType.WinFX: - // Wrong version of Avalon is installed. - errorTitle = SR.Get(SRID.PlatformRequirementTitle); - errorMessage = SR.Get(SRID.IncompatibleWinFXText, version); - break; - case MissingDependencyType.CLR: - // Missing CLR dependency - errorTitle = SR.Get(SRID.PlatformRequirementTitle); - errorMessage = SR.Get(SRID.IncompatibleCLRText, version); - break; - default: - // All other deployment exceptions - DeploymentExceptionMapper.GetErrorTextFromException(exception, out errorTitle, out errorMessage); - break; - } - - IErrorPage errorpage = null; - - if (_errorPageClass != null) - { - errorpage = GetCustomPage(_errorPageAssembly, _errorPageClass) as IErrorPage; - } - // If we failed to get a custom page, or didn't even try, use our default. - if (errorpage == null) - { - //use default class - errorpage = new InstallationErrorPage() as IErrorPage; - } - - errorpage.DeploymentPath = _deploymentManifest; - errorpage.ErrorTitle = errorTitle; - errorpage.ErrorText = errorMessage; - errorpage.SupportUri = supportUri; - errorpage.LogFilePath = logFilePath; - errorpage.RefreshCallback = new DispatcherOperationCallback(UserRefresh); - errorpage.GetWinFxCallback = (getWinFXReq != MissingDependencyType.Others)? new DispatcherOperationCallback(GetWinFX) : null; - errorpage.ErrorFlag = true; - - BrowserWindow.Navigate(errorpage); - } - - private void HandleCancel() - { - - // After _runApplication is set to true, we no longer allow canceling deployment. - if (_cancelHandled || _runApplication) - return; - _cancelHandled = _canceled = true; - - // Delete the cached trust decision to force going down the full ClickOnce path next time - DeleteCachedApplicationTrust(_identity); - - // If we are being shut down by the browser, don't do anything else. - if (IsShuttingDown) - { - AbortActivation(); - return; - } - - CancelAsynchronousOperation(); - - // ASSUMES ALREADY IN CORRECT CONTEXT - SetStatusText(SR.Get(SRID.HostingStatusCancelled)); - string errorTitle, errorMessage; - DeploymentExceptionMapper.GetErrorTextFromException(null, out errorTitle, out errorMessage); - IErrorPage errorpage = null; - //dont even try to use reflection if assembly name is null - if (_errorPageAssembly != null || _errorPageClass != null) - { - errorpage = GetCustomPage(_errorPageAssembly, _errorPageClass) as IErrorPage; - } - //if this is null then there is no custom page so fall back to default ui - if (errorpage == null) - { - //use default class - errorpage = new InstallationErrorPage() as IErrorPage; - } - - errorpage.DeploymentPath = _deploymentManifest; - errorpage.ErrorTitle = errorTitle; - errorpage.ErrorText = errorMessage; - errorpage.SupportUri = null; - errorpage.LogFilePath = null; - errorpage.ErrorFlag = false; - errorpage.RefreshCallback = new DispatcherOperationCallback(UserRefresh); - errorpage.GetWinFxCallback = null; - - BrowserWindow.Navigate(errorpage); - } - - void DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e) - { - _bytesDownloaded = e.BytesDownloaded; - _bytesTotal = e.TotalBytesToDownload; - - if (!_updatePending) - { - _updatePending = true; - Dispatcher.BeginInvoke( - DispatcherPriority.Background, - new DispatcherOperationCallback(DoDownloadProgressChanged), - null); - } - } - - private object DoDownloadProgressChanged(object unused) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Level.Verbose, EventTrace.Event.WpfHost_DownloadProgressUpdate, _bytesDownloaded, _bytesTotal); - - // !_isInAsynchronousOperation implies activation failed or was canceled. - if (!_isInAsynchronousOperation || IsShuttingDown) - return null; - Debug.Assert(!_canceled); - - - if (_progressPage != null) - { - _progressPage.UpdateProgress(_bytesDownloaded, _bytesTotal); - } - _updatePending = false; - - return null; - } - - void DownloadApplicationCompleted(object sender, DownloadApplicationCompletedEventArgs e) - { - _hostingManager.DownloadProgressChanged -= new EventHandler(DownloadProgressChanged); - - // UPDATE: The explanation below is from the time when IPHM was created on the GUI (main) thread. - // Now BeginInvoke() is needed merely to switch to that thread from whatever worker thread IPHM is - // raising this event on. - // - // Using BeginInvoke() to avoid a deadlock. InPlaceHostingManager allows only one thread to run - // any one of its methods at a time. The DownloadApplicationCompleted event is raised on the main - // thread but under IPHM's internal lock. Our handler (DoDownloadApplicationCompleted) needs to - // synchronize with the thread that calls IPHM.AssertApplicationRequirements(). That thread may - // be trying to call AAR(), which needs to take IPHM's internal lock. But it's already taken by the - // code that raises the DownloadApplicationCompleted event, and in our handler we wait on AAR() to - // complete. => deadlock - // - Dispatcher.BeginInvoke(DispatcherPriority.Normal, new DispatcherOperationCallback(DoDownloadApplicationCompleted), e); - } - - private object DoDownloadApplicationCompleted(object e) - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_DownloadApplicationEnd); - - DownloadApplicationCompletedEventArgs args = (DownloadApplicationCompletedEventArgs)e; - - ClearAsynchronousOperationStatus(); - // Shutdown may have started and IBrowserCallbackServices may have become unavailable. - // In particular, making calls to the browser, just like above, could cause a pending shutdown - // call to be dispatched. - if (IsShuttingDown) - return null; - - if (args.Error != null) - { - // Synchronizing with AssertApplicationRequirementsAsync(). (If no error here, AAR must have - // succeeded too.) IPHM could throw exceptions on both threads, in any order. We should - // handle only one, and we prefer the one from AAR as it tends to be more meaningful, except - // in the case when it's InvalidOperationException due to an error already encountered during - // application download and IPHM getting set to a dead state internally. - _assertAppRequirementsEvent.WaitOne(); - if (!_assertAppRequirementsFailed) - { - HandleError(args.Error, args.LogFilePath, _getManifestCompletedEventArgs.SupportUri, null); - } - return null; - } - - // Race condition: UserStop() can be called after InPlaceHostingManager has completed - // the downloading but before our callback is called. - bool canceled = _canceled || args.Cancelled; - if (canceled) - { - HandleCancel(); - return null; - } - - SetStatusText(SR.Get(SRID.HostingStatusPreparingToRun)); - // This is the last progress message set. It is cleared by - // IBrowserCallbackServices.OnBeforeShowNavigationWindow() (in CColeDocument). - - // Go through the Dispatcher at a lower priority to allow the above status message to render. - // There can be a signficant delay between the end of downloading and the rendering of the first - // application page, especially on cold start. - Dispatcher.BeginInvoke(DispatcherPriority.Input, new DispatcherOperationCallback( - delegate(object unused) - { - if (!IsCanceledOrShuttingDown) - { - RunApplicationAsync(ExecuteDownloadedApplication); - } - return null; - }), null); - - return null; - } - - private bool ExecuteDownloadedApplication() - { - _runApplication = false; - - try - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_ClickOnceActivationStart, KnownBoxes.BooleanBoxes.FalseBox); - - ObjectHandle oh = _hostingManager.Execute(); - GotNewAppDomain(oh); - - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting | EventTrace.Keyword.KeywordPerf, EventTrace.Event.WpfHost_ClickOnceActivationEnd); - - return true; - } - finally - { - Shutdown(); - } - } - - private object UserStop(object unused) - { - UserStop(); - return null; - } - - internal void UserStop() - { - if (_isInAsynchronousOperation) - { - CancelAsynchronousOperation(); - } - else - { - HandleCancel(); - } - - } - - internal void AbortActivation() - { - EventTrace.EasyTraceEvent(EventTrace.Keyword.KeywordHosting, EventTrace.Event.WpfHost_AbortingActivation); - - CancelAsynchronousOperation(); - _runApplication = false; - Shutdown(ERROR_ACTIVATION_ABORTED); - } - - private void CancelAsynchronousOperation() - { - lock (_lockObject) - { - if (_isInAsynchronousOperation) - { - Debug.Assert(!_canceled); - _canceled = true; - Invariant.Assert(_hostingManager != null, "_hostingManager should not be null if _isInAsynchronousOperation is true"); - _hostingManager.CancelAsync(); - ClearAsynchronousOperationStatus(); - } - } - } - - private bool IsCanceledOrShuttingDown - { - get - { - Debug.Assert(!(_canceled && _isInAsynchronousOperation)); - return _canceled || IsShuttingDown; - } - } - - #if DEBUG - [DebuggerBrowsable(DebuggerBrowsableState.Never)] - #endif - private RootBrowserWindow BrowserWindow - { - get - { - RootBrowserWindow rbw = (RootBrowserWindow)GetAppWindow(); - Invariant.Assert(rbw != null, "Should have instantiated RBW if it wasn't already there"); - rbw.ShowsNavigationUI = false; // not needed and not RightToLeft-enabled in this context - return rbw; - } - } - - private void CreateApplicationIdentity() - { - _identity = null; - if (_applicationId != null) - { - try - { - _identity = new ApplicationIdentity(_applicationId); - } - catch(NullReferenceException) - { - throw; - } - catch(SEHException) - { - throw; - } - catch(Exception) - { - } - } - } - - /// - /// This is necessary as a workaround for various ClickOnce issues and the interaction - /// between cached trust decisions and our direct activation shortcut. If there is a - /// cached trust decision for a given ApplicationIdentity, we will try the direct - /// activation shortcut. If something goes wrong, we want to delete that cached trust - /// decision, so that next time we will be forced to go down the offical ClickOnce - /// deployment pathway. - /// - private void DeleteCachedApplicationTrust(ApplicationIdentity identity) - { - if (identity != null) - { - ApplicationTrust trust = new ApplicationTrust(identity); - // This does not throw if the trust isn't there. - ApplicationSecurityManager.UserApplicationTrusts.Remove(trust); - } - } - - /// - /// This function is private to xapplauncher. It invokes the default browser with Uri - /// to WinFXSetup.exe. Its called from the "Install WinFX" button on the error page - /// shown when an app requests a different version of WinFX than the one installed. - /// - private object GetWinFX(object unused) - { - bool frameworkActivated = false; - - - // Order matters newer OS versions should be tested before older OS versions - if (OperatingSystemVersionCheck.IsVersionOrLater(OperatingSystemVersion.Windows8)) - { - // Use FOD to activate the required framework version - Invariant.Assert(!String.IsNullOrEmpty(_requiredCLRVersion)); - UnsafeNativeMethods.TryGetRequestedCLRRuntime(_requiredCLRVersion); - frameworkActivated = true; - } - else if (OperatingSystemVersionCheck.IsVersionOrLater(OperatingSystemVersion.WindowsVista)) - { - // Vista and Win7 - // v3 of the framework come with the OS, use OCSetup to activate it - // all other versions of the framework, use fwLinks to activate the required framework version - switch(_requiredCLRVersion) - { - case "v2.0.50727": - string full_ocSetupPath = System.IO.Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.System), - "ocsetup.exe"); - - ProcessStartInfo startInfo = new ProcessStartInfo(full_ocSetupPath, "NetFx3") { - Verb = "runas" // required to prompt for elevation - }; - - System.Diagnostics.Process.Start(startInfo); - frameworkActivated = true; - break; - - // Use fwLinks to activate the required framework version - default: - Invariant.Assert(_fwlinkUri != null); - AppSecurityManager.ShellExecuteDefaultBrowser(_fwlinkUri); - frameworkActivated = true; - break; - } - } - - if (!frameworkActivated && _fwlinkUri != null) - { - // Use fwLinks to activate the required framework version - Invariant.Assert(_fwlinkUri != null); - AppSecurityManager.ShellExecuteDefaultBrowser(_fwlinkUri); - } - - return null; - } - - /// - /// Given a WinFx version number (usually) obtained from WindowsBase.dll - /// returns the CLR version that WinFx is layered on top of. - /// returns null for unknown WinFx versions. - /// - private static string ClrVersionFromWinFXVersion(string winfxVersion) - { - string clrVersion = null; - - switch(winfxVersion) - { - case "3.0": - case "3.5": - clrVersion = "v2.0.50727"; - break; - - case "4.0": - clrVersion = "v4.0.30319"; - break; - - default: - break; - } - - return clrVersion; - } - - private void SetStatusText(string newStatusText) - { - IProgressPage2 pp2 = _progressPage as IProgressPage2; - if (pp2 != null) - { - pp2.ShowProgressMessage(newStatusText); - } - BrowserInteropHelper.HostBrowser.SetStatusText(newStatusText); - } - - /// - /// If trust was not granted, it may have been because the assembly of a custom permission - /// could not be loaded. In this case, we are interested in custom permissions that are - /// from WindowsBase. - /// - /// The XmlReader for the application manifest - /// If the specified version of WindowsBase could not be loaded, the version, else null. - private string GetMissingCustomPermissionVersion(XmlReader reader) - { - string requiredVersion = null; - - while (reader.ReadToFollowing("IPermission", "urn:schemas-microsoft-com:asm.v2")) - { - string attr = reader.GetAttribute("class"); - - // Strip the first item in the comma-delimited list, which is the permission class - AssemblyName assyName = new AssemblyName(attr.Substring(attr.IndexOf(",",StringComparison.OrdinalIgnoreCase) + 1)); - if (assyName.Name.Equals("WindowsBase", StringComparison.OrdinalIgnoreCase)) - { - try - { - Assembly assy = Assembly.Load(assyName); - } - catch (Exception e) - { - // This will give a FileLoadException under the debugger, but a FileNotFoundException otherwise - if (e is System.IO.FileNotFoundException || e is System.IO.FileLoadException) - { - requiredVersion = assyName.Version.ToString(); - break; - } - else - { - throw; - } - } - } - } - - reader.Close(); - - return requiredVersion; - } - - // Called by the laucher in preparation for launching an XBAP and shutting down. - // We used to just call Shutdown on XAppLauncher and launch the XBAP in a Shutdown handler - // However sometimes the initial launch of a cached XBAP fails - // so we refresh the cache by downloading the XBAP and retrying the launch. - // This retry cannot succeed while shutdown is in progress so we now - // Launch the XBAP in a dispatcher callback - // If the XBAP launch does not immediately fail we shutdown XappLauncher - private void RunApplicationAsync(DocObjHost.ApplicationRunner applicationRunner) - { - Invariant.Assert(applicationRunner != null); - _applicationRunner = applicationRunner; - _runApplication = true; - Dispatcher.BeginInvoke(DispatcherPriority.Normal, new DispatcherOperationCallback(RunApplicationAsyncCallback), null); - } - - private object RunApplicationAsyncCallback(object unused) - { - if (_runApplication) - { - _applicationRunnerCallback(new DocObjHost.ApplicationRunner(_applicationRunner)); - } - - return null; - } - - - /* Threading issues with IPHM * - IPHM has weird threading behavior. This makes controlling it challenging. - 1. It has partial thread affinity. Some events get raised on the thread on which the object is - created, others straight on some worker thread. Either way, we want to do all our processing - on the UI thread, so we always go through the Dispatcher. This also ensures that the right - ExecutionContext will be applied and the ExceptionWrapper will be in scope. - 2. It allows some concurreny. In particular, we rely much on application downloading and - AssertApplicationRequirements() to be done in parallel for better cold-start performance. - (Optimization done in v3.5 SP1.) - 3. However, IPHM uses an internal lock to allow only one method at a time to run. This leads to - unnecessary blocking of the threads using IPHM and thus potential deadlocks. - * When we started allowing the ClickOnce elevation prompt, this became a bigger issue. - The prompt is shown under IPHM's internal lock. This made download progress updates pushed - to the main thread block that thread. This in turn prevented the progress page from - repainting when the elevation prompt is dragged over it. The solution was to create IPHM - on a worker thread so that it never tries to call back on the main thread (see issue 1). - Now we are in charge of synchronizing with the main (UI) thread as necessary. For the most - part, Dispatcher.BeginInvoke() solves all problems. - */ - InPlaceHostingManager _hostingManager; - - IBrowserCallbackServices _browser; - ApplicationIdentity _identity; - Uri _deploymentManifest; - Uri _fwlinkUri; - string _requiredCLRVersion; - string _applicationId; - System.ActivationContext _context; - DocObjHost.ApplicationRunnerCallback _applicationRunnerCallback; - DocObjHost.ApplicationRunner _applicationRunner; - - INativeProgressPage _nativeProgressPage; - IProgressPage _progressPage; - bool _runApplication; - GetManifestCompletedEventArgs _getManifestCompletedEventArgs; - - const int ERROR_ACTIVATION_ABORTED = 30; // defined in host\inc\Definitions.hxx - - object _lockObject = new object(); - ManualResetEvent _assertAppRequirementsEvent; - - long _bytesDownloaded; - long _bytesTotal; - bool _updatePending; - - string _progressPageAssembly = null; - string _progressPageClass = null; - string _errorPageAssembly = null; - string _errorPageClass = null; - - bool _commandBindingsRegistered; - - bool _isInAsynchronousOperation; - volatile bool _canceled; - bool _cancelHandled; - volatile bool _assertAppRequirementsFailed; - bool _refreshing; - bool _hasTriedUriActivation; - - static class UnsafeNativeMethods - { - [DllImport(DllImport.PresentationNative, CharSet = CharSet.Unicode)] - public static extern - int /* HRESULT */ - TryGetRequestedCLRRuntime(string versionString); - } - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index b83a90247c4..4a66cb9f39f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -110,35 +110,28 @@ - - - - - - @@ -408,7 +401,6 @@ - @@ -507,7 +499,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/RootBrowserWindowAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/RootBrowserWindowAutomationPeer.cs deleted file mode 100644 index 8199f50524f..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/RootBrowserWindowAutomationPeer.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using MS.Internal.AppModel; - -namespace System.Windows.Automation.Peers -{ - - /// - internal class RootBrowserWindowAutomationPeer : WindowAutomationPeer - { - /// - public RootBrowserWindowAutomationPeer(RootBrowserWindow owner): base(owner) - {} - - /// - override protected string GetClassNameCore() - { - return "RootBrowserWindow"; - } - - } -} - - - From 6736ff784b30b9b6d70bc451c6026049044647e7 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 24 Jun 2019 17:46:59 -0700 Subject: [PATCH 007/227] Some YAML improvements --- azure-pipelines.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e09eb0f67d..5c6391a9d27 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,16 +14,31 @@ variables: _PublishUsingPipelines: true _DotNetArtifactsCategory: WINDOWSDESKTOP +# Setting batch to true, triggers one build at a time. +# if there is a push while a build in progress, it will wait, +# until the running build finishes, and produce a build with all the changes +# # only trigger ci builds for the master and release branches trigger: -- master -- release/3.0 -- arcade - -# To be added in the future when VSTS supports this feature -# only trigger pull request builds for the master branch -# pr: -# - master + batch: true + branches: + include: + - master + - release/3.0 + # - arcade + paths: + exclude: + -Documentation/* + +pr: + autoCancel: true + branches: + include: + - master + - release/3.0 + paths: + exclude: + - Documentation/* # Call the pipeline.yml template, which does the real work jobs: From 020c89e5e92fcdd1d1f0f20901ae56b7ca331dd6 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 24 Jun 2019 22:12:27 -0700 Subject: [PATCH 008/227] Add a high-level override to prevent Helix tests from running --- azure-pipelines.yml | 5 +++++ eng/pipeline.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c6391a9d27..7af253dd027 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,6 +14,11 @@ variables: _PublishUsingPipelines: true _DotNetArtifactsCategory: WINDOWSDESKTOP +# This is set in the pipeline directly +# When set to false, CI tests will not be enabled in builds. +# +# _ContinuousIntegrationTestsEnabled: true + # Setting batch to true, triggers one build at a time. # if there is a push while a build in progress, it will wait, # until the running build finishes, and produce a build with all the changes diff --git a/eng/pipeline.yml b/eng/pipeline.yml index f63502e41f0..1d013cc70a1 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -157,4 +157,4 @@ jobs: HelixAccessToken: $(_HelixToken) # only defined for internal CI Creator: $(_HelixCreator) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true')) # on helix machine (with real signing) when running on the public build pipeline + condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), ne(variables['_ContinuousIntegrationTestsEnabled'], 'false')) # on helix machine (with real signing) when running on the public build pipeline From fd354888539b800749d9af3c81396042fec9b4ae Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 24 Jun 2019 22:21:05 -0700 Subject: [PATCH 009/227] Fix a space --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7af253dd027..d1344812983 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,7 +33,7 @@ trigger: # - arcade paths: exclude: - -Documentation/* + - Documentation/* pr: autoCancel: true From 728457a249771410524bbbf5e90fe9046761445f Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 24 Jun 2019 23:10:50 -0700 Subject: [PATCH 010/227] Offload Helix onto a separate pipeline --- azure-pipelines.yml | 2 +- eng/pipeline.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d1344812983..1ac44fa05ad 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ variables: # This is set in the pipeline directly # When set to false, CI tests will not be enabled in builds. # -# _ContinuousIntegrationTestsEnabled: true +# _ContinuousIntegrationTestsEnabled: false # Setting batch to true, triggers one build at a time. # if there is a push while a build in progress, it will wait, diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 1d013cc70a1..8eb60684bf1 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -140,6 +140,8 @@ jobs: $(_OfficialBuildIdArgs) $(_PlatformArgs) displayName: Windows Build / Publish + # This condition should be kept in sync with the condition for 'Run DRTs' step + condition: or(ne(variables['_ContinuousIntegrationTestsOnlyPipeline'], 'true'), and(eq(variables['_ContinuousIntegrationTestsOnlyPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))) # Run DRTs - powershell: eng\common\cibuild.cmd @@ -157,4 +159,5 @@ jobs: HelixAccessToken: $(_HelixToken) # only defined for internal CI Creator: $(_HelixCreator) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), ne(variables['_ContinuousIntegrationTestsEnabled'], 'false')) # on helix machine (with real signing) when running on the public build pipeline + # This condition should be kept in sync with the condition for cibuild.cmd step + condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true')) # on helix machine (with real signing) when running on the public build pipeline From 9ceb6eb72306f113e43bbbbb4fff881477c3bbdf Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Fri, 28 Jun 2019 14:30:06 -0700 Subject: [PATCH 011/227] Improve conditions --- eng/pipeline.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 8eb60684bf1..ac26e7ecb8c 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -50,6 +50,8 @@ jobs: value: x86 - name: _PlatformArgs value: /p:Platform=$(_Platform) + - name: _PublicBuildPipeline # We will run Helix tests when building in the open, but do not repeat when building and publishing again using the internal build-pipeline + value: true - name: _TestHelixAgentPool value: 'Windows.10.Amd64.ClientRS5.Open' # Preferred:'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.ClientRS5.Open'; See https://github.com/dotnet/wpf/issues/952 - name: _HelixStagingDir @@ -60,8 +62,7 @@ jobs: value: '' - name: _HelixCreator value: ${{ parameters.repoName }} - - name: _HelixPublicBuildPipeline # Run Helix tests when building in the open, do not repeat when building and publishign again using the internal build-pipeline - value: true + # Override some values if we're building internally - ${{ if eq(parameters.runAsPublic, 'false') }}: @@ -93,6 +94,8 @@ jobs: /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + - name: _PublicBuildPipeline + value: false - name: _HelixSource value: official/${{ parameters.repoName }}/$(Build.SourceBranch) - name: _HelixToken @@ -101,8 +104,7 @@ jobs: value: '' #if _HelixToken is set, Creator must be empty - name: _TestHelixAgentPool value: 'Windows.10.Amd64.ClientRS5' # Preferred: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.ClientRS5' - - name: _HelixPublicBuildPipeline - value: false + strategy: matrix: Build_Debug_x86: @@ -141,7 +143,11 @@ jobs: $(_PlatformArgs) displayName: Windows Build / Publish # This condition should be kept in sync with the condition for 'Run DRTs' step - condition: or(ne(variables['_ContinuousIntegrationTestsOnlyPipeline'], 'true'), and(eq(variables['_ContinuousIntegrationTestsOnlyPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))) + # When building on a regular pipeline (!_HelixPipeline), build as usual + # When building on a Helix pipeline, only build Release configs + # (!_HelixPipeline) || + # (_HelixPipeline && _PublicBuildPipeline && _ContinuousIntegrationTestsEnabled && _BuildConfig == Release) + condition: or(ne(variables['_HelixPipeline'], 'true'), and(eq(variables['_HelixPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true'))) # Run DRTs - powershell: eng\common\cibuild.cmd @@ -159,5 +165,10 @@ jobs: HelixAccessToken: $(_HelixToken) # only defined for internal CI Creator: $(_HelixCreator) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - # This condition should be kept in sync with the condition for cibuild.cmd step - condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true')) # on helix machine (with real signing) when running on the public build pipeline + # This condition should be kept in sync with the condition for cibuild.cmd step with displayName: "Windows Build / Publish" + # Only run ... + # ...When building on a Helix pipeline, only build Release configs + # + # (_HelixPipeline && _PublicBuildPipeline && _ContinuousIntegrationTestsEnabled && _BuildConfig == Release) + # + condition: and(succeeded(), eq(variables[_HelixPipeline], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true')) From df315755f28c8c8d5b230ebf5f8ddb421f589ff8 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Fri, 28 Jun 2019 15:31:20 -0700 Subject: [PATCH 012/227] Fix quote --- eng/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipeline.yml b/eng/pipeline.yml index ac26e7ecb8c..d69eed437ce 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -171,4 +171,4 @@ jobs: # # (_HelixPipeline && _PublicBuildPipeline && _ContinuousIntegrationTestsEnabled && _BuildConfig == Release) # - condition: and(succeeded(), eq(variables[_HelixPipeline], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true')) + condition: and(succeeded(), eq(variables['_HelixPipeline'], 'true') ,eq(variables['_BuildConfig'], 'Release'), eq(variables['_PublicBuildPipeline'], 'true'), eq(variables['_ContinuousIntegrationTestsEnabled'], 'true')) From 4221809b37e4aa60112c765625dec9c4c97670fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 12:26:11 +0000 Subject: [PATCH 013/227] Update dependencies from https://github.com/dotnet/arcade build 20190628.2 (#1122) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19328.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19328.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19328.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19328.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19328.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a671a56d51..de86a7a6225 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 247c0290c554a68dd3e560dd88fb0da26353d9d7 + a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef - + https://github.com/dotnet/arcade - 247c0290c554a68dd3e560dd88fb0da26353d9d7 + a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 247c0290c554a68dd3e560dd88fb0da26353d9d7 + a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef - + https://github.com/dotnet/arcade - 247c0290c554a68dd3e560dd88fb0da26353d9d7 + a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef - + https://github.com/dotnet/arcade - 247c0290c554a68dd3e560dd88fb0da26353d9d7 + a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef diff --git a/eng/Versions.props b/eng/Versions.props index 0aba4b941fd..94536d81f8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19327.39 - 1.0.0-beta.19327.39 - 1.0.0-beta.19327.39 + 1.0.0-beta.19328.2 + 1.0.0-beta.19328.2 + 1.0.0-beta.19328.2 diff --git a/global.json b/global.json index 5c2f6dc81e0..eccfa209a25 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19327.39", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19327.39" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19328.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19328.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 8e555da639d4295c938ace3a7e1cb3376d596963 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 13:19:22 +0000 Subject: [PATCH 014/227] Update dependencies from https://github.com/dotnet/winforms build 20190628.6 (#1123) - Microsoft.Private.Winforms - 4.8.0-preview7.19328.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de86a7a6225..7eac6850fe5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - d6d68878828e5f96f91da68a956a1a49f058e2f4 + e6eae242229390ee477d70ba8424f266b801cb56 diff --git a/eng/Versions.props b/eng/Versions.props index 94536d81f8a..ab2d5018110 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview7.19327.3 + 4.8.0-preview7.19328.6 From 17156fbea922c15ce2a77e66d798642a7ab8a607 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2019 13:29:35 +0000 Subject: [PATCH 015/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190628.4 (#1124) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19328.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7eac6850fe5..7327c36573a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - f1e63734270607bd9246383cd72132c7ecae89be + d1f9c9daf947322bc4feb462c5c4dc8e5c62908a https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index ab2d5018110..15e0542f74b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19327.5 + 4.8.0-preview8.19328.4 From d6229ce5e1a43c557dfed63af4eb5959bfbd0d35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 12:25:56 +0000 Subject: [PATCH 016/227] Update dependencies from https://github.com/dotnet/arcade build 20190629.2 (#1125) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19329.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19329.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19329.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19329.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19329.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7327c36573a..970778cd6f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef + 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 - + https://github.com/dotnet/arcade - a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef + 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef + 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 - + https://github.com/dotnet/arcade - a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef + 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 - + https://github.com/dotnet/arcade - a68bcce61fa64598cbd30c00780b1f6ca8e7a9ef + 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 diff --git a/eng/Versions.props b/eng/Versions.props index 15e0542f74b..bd0d8351fbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19328.2 - 1.0.0-beta.19328.2 - 1.0.0-beta.19328.2 + 1.0.0-beta.19329.2 + 1.0.0-beta.19329.2 + 1.0.0-beta.19329.2 diff --git a/global.json b/global.json index eccfa209a25..82e95e99ef4 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19328.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19328.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19329.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19329.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 1cdb13aa07ff78627a886e2e383917b5ae51d3d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 13:49:51 +0000 Subject: [PATCH 017/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190629.3 (#1126) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19329.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 970778cd6f4..98a86d689c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - d1f9c9daf947322bc4feb462c5c4dc8e5c62908a + 721dcadc6bdabf6af02375d4c5202ddc6a764ffe https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index bd0d8351fbd..c56860e94c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19328.4 + 4.8.0-preview8.19329.3 From 851fc2ac4b8d87593238988f53a4b02ff633440f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 13:01:35 +0000 Subject: [PATCH 018/227] Update dependencies from https://github.com/dotnet/arcade build 20190630.1 (#1128) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19330.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19330.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19330.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19330.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19330.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98a86d689c9..989fcaf10ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 + 89fab80685c91024c8f9e21f1c37f62580f648f8 - + https://github.com/dotnet/arcade - 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 + 89fab80685c91024c8f9e21f1c37f62580f648f8 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 + 89fab80685c91024c8f9e21f1c37f62580f648f8 - + https://github.com/dotnet/arcade - 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 + 89fab80685c91024c8f9e21f1c37f62580f648f8 - + https://github.com/dotnet/arcade - 3ebba82f29f338a3cb14f4b3e1b6da0fd69be694 + 89fab80685c91024c8f9e21f1c37f62580f648f8 diff --git a/eng/Versions.props b/eng/Versions.props index c56860e94c9..4bdb336d057 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19329.2 - 1.0.0-beta.19329.2 - 1.0.0-beta.19329.2 + 1.0.0-beta.19330.1 + 1.0.0-beta.19330.1 + 1.0.0-beta.19330.1 diff --git a/global.json b/global.json index 82e95e99ef4..f7a5d7b91d4 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19329.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19329.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19330.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19330.1" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 0efd67dd0149afe3e9a770b87152590648d3306a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 14:06:18 +0000 Subject: [PATCH 019/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190630.3 (#1129) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19330.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 989fcaf10ed..4cc6a5e3f19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 721dcadc6bdabf6af02375d4c5202ddc6a764ffe + 00f230cb3481b29d70493e322589635e439c3251 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 4bdb336d057..788272ab983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19329.3 + 4.8.0-preview8.19330.3 From 6660e04933fdd7db7594c245a37eb30a0a0c16c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2019 12:20:56 +0000 Subject: [PATCH 020/227] Update dependencies from https://github.com/dotnet/arcade build 20190701.4 (#1142) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19351.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19351.4 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19351.4 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19351.4 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19351.4 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cc6a5e3f19..ec0fce9a428 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 89fab80685c91024c8f9e21f1c37f62580f648f8 + 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 - + https://github.com/dotnet/arcade - 89fab80685c91024c8f9e21f1c37f62580f648f8 + 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 89fab80685c91024c8f9e21f1c37f62580f648f8 + 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 - + https://github.com/dotnet/arcade - 89fab80685c91024c8f9e21f1c37f62580f648f8 + 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 - + https://github.com/dotnet/arcade - 89fab80685c91024c8f9e21f1c37f62580f648f8 + 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 diff --git a/eng/Versions.props b/eng/Versions.props index 788272ab983..226bb02c06e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19330.1 - 1.0.0-beta.19330.1 - 1.0.0-beta.19330.1 + 1.0.0-beta.19351.4 + 1.0.0-beta.19351.4 + 1.0.0-beta.19351.4 diff --git a/global.json b/global.json index f7a5d7b91d4..1f1b03eb697 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19330.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19330.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19351.4", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19351.4" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 06f53d59702914ec2930fd0789743f4457b2d6f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2019 12:51:43 +0000 Subject: [PATCH 021/227] Update dependencies from https://github.com/dotnet/winforms build 20190701.8 (#1143) - Microsoft.Private.Winforms - 4.8.0-preview8.19351.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec0fce9a428..396c62abd4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - e6eae242229390ee477d70ba8424f266b801cb56 + c87f30f7e895f08a78efc349437d187f60fd1d58 diff --git a/eng/Versions.props b/eng/Versions.props index 226bb02c06e..95b1357f6ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview7.19328.6 + 4.8.0-preview8.19351.8 From b42b7f3378ccce82117714640148d722cb8a5a2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2019 13:23:48 +0000 Subject: [PATCH 022/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190701.3 (#1144) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19351.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 396c62abd4c..c1f55929b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 00f230cb3481b29d70493e322589635e439c3251 + 1de95ad8207ffeeed5fb1d0889207b6fdc365afa https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 95b1357f6ca..f89d6f4b92e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19330.3 + 4.8.0-preview8.19351.3 From dd3dc0175080bfcab78d2d17fc0b01e11cb822e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2019 12:21:02 +0000 Subject: [PATCH 023/227] Update dependencies from https://github.com/dotnet/arcade build 20190702.7 (#1151) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19352.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19352.7 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19352.7 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19352.7 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19352.7 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1f55929b95..f0b85e29663 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 + b8c190d95371e658d95a5731f4778bd3da2fa42d - + https://github.com/dotnet/arcade - 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 + b8c190d95371e658d95a5731f4778bd3da2fa42d https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 + b8c190d95371e658d95a5731f4778bd3da2fa42d - + https://github.com/dotnet/arcade - 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 + b8c190d95371e658d95a5731f4778bd3da2fa42d - + https://github.com/dotnet/arcade - 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 + b8c190d95371e658d95a5731f4778bd3da2fa42d diff --git a/eng/Versions.props b/eng/Versions.props index f89d6f4b92e..5c563ed8fd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19351.4 - 1.0.0-beta.19351.4 - 1.0.0-beta.19351.4 + 1.0.0-beta.19352.7 + 1.0.0-beta.19352.7 + 1.0.0-beta.19352.7 diff --git a/global.json b/global.json index 1f1b03eb697..836e5eeb8ee 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19351.4", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19351.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19352.7", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19352.7" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 7701489e91a87929c7cf5f5efe33edbc30445cf9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2019 12:53:56 +0000 Subject: [PATCH 024/227] Update dependencies from https://github.com/dotnet/winforms build 20190702.6 (#1152) - Microsoft.Private.Winforms - 4.8.0-preview8.19352.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0b85e29663..a5df78a6c0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - c87f30f7e895f08a78efc349437d187f60fd1d58 + 3b4f01820b1c677b3e8c73a4e869dda07795f3c9 diff --git a/eng/Versions.props b/eng/Versions.props index 5c563ed8fd0..c6727c14ebf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19351.8 + 4.8.0-preview8.19352.6 From e1b994f4ecf330356e240784129c8b39ea443e76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2019 13:20:23 +0000 Subject: [PATCH 025/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190702.5 (#1153) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19352.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5df78a6c0b..a25ab0a0422 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 1de95ad8207ffeeed5fb1d0889207b6fdc365afa + 30e31f6027fd361c4def538334380fc2df6f5361 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index c6727c14ebf..11e9d2d0caf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19351.3 + 4.8.0-preview8.19352.5 From f2c0fa657730878976f99f6717ef8f7886138a24 Mon Sep 17 00:00:00 2001 From: Youssef1313 <31348972+Youssef1313@users.noreply.github.com> Date: Wed, 3 Jul 2019 17:23:19 +0200 Subject: [PATCH 026/227] Use nameof instead of magic string (#1156) --- .../System/Windows/Markup/XamlWriter.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlWriter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlWriter.cs index 58b1d50346e..4ddff384efd 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlWriter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlWriter.cs @@ -54,7 +54,7 @@ public static string Save(object obj) // Validate input arguments if (obj == null) { - throw new ArgumentNullException("obj"); + throw new ArgumentNullException(nameof(obj)); } // Create TextWriter @@ -92,11 +92,11 @@ public static void Save(object obj, TextWriter writer) // Validate input arguments if (obj == null) { - throw new ArgumentNullException("obj"); + throw new ArgumentNullException(nameof(obj)); } if (writer == null) { - throw new ArgumentNullException("writer"); + throw new ArgumentNullException(nameof(writer)); } // Create XmlTextWriter @@ -123,11 +123,11 @@ public static void Save(object obj, Stream stream) // Validate input arguments if (obj == null) { - throw new ArgumentNullException("obj"); + throw new ArgumentNullException(nameof(obj)); } if (stream == null) { - throw new ArgumentNullException("stream"); + throw new ArgumentNullException(nameof(stream)); } // Create XmlTextWriter @@ -156,11 +156,11 @@ public static void Save(object obj, XmlWriter xmlWriter) // Validate input arguments if (obj == null) { - throw new ArgumentNullException("obj"); + throw new ArgumentNullException(nameof(obj)); } if (xmlWriter == null) { - throw new ArgumentNullException("xmlWriter"); + throw new ArgumentNullException(nameof(xmlWriter)); } try @@ -192,11 +192,11 @@ public static void Save(object obj, XamlDesignerSerializationManager manager) // Validate input arguments if (obj == null) { - throw new ArgumentNullException("obj"); + throw new ArgumentNullException(nameof(obj)); } if (manager == null) { - throw new ArgumentNullException("manager"); + throw new ArgumentNullException(nameof(manager)); } MarkupWriter.SaveAsXml(manager.XmlWriter, obj, manager); From e077d10d22c19fdfc7c007898ff237a0210d8c63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2019 12:16:33 +0000 Subject: [PATCH 027/227] Update dependencies from https://github.com/dotnet/arcade build 20190703.19 (#1173) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19353.19 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19353.19 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19353.19 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19353.19 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19353.19 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/sdl/execute-all-sdl-tools.ps1 | 8 +++++--- eng/common/sdl/run-sdl.ps1 | 12 +++++++----- global.json | 4 ++-- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a25ab0a0422..b471f759b9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - b8c190d95371e658d95a5731f4778bd3da2fa42d + 733f8297b68dd824044a77d955e62305b9dc43d5 - + https://github.com/dotnet/arcade - b8c190d95371e658d95a5731f4778bd3da2fa42d + 733f8297b68dd824044a77d955e62305b9dc43d5 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - b8c190d95371e658d95a5731f4778bd3da2fa42d + 733f8297b68dd824044a77d955e62305b9dc43d5 - + https://github.com/dotnet/arcade - b8c190d95371e658d95a5731f4778bd3da2fa42d + 733f8297b68dd824044a77d955e62305b9dc43d5 - + https://github.com/dotnet/arcade - b8c190d95371e658d95a5731f4778bd3da2fa42d + 733f8297b68dd824044a77d955e62305b9dc43d5 diff --git a/eng/Versions.props b/eng/Versions.props index 11e9d2d0caf..f6161b841fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19352.7 - 1.0.0-beta.19352.7 - 1.0.0-beta.19352.7 + 1.0.0-beta.19353.19 + 1.0.0-beta.19353.19 + 1.0.0-beta.19353.19 diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 0635f26fb63..aab7589f2cc 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -22,7 +22,9 @@ Param( [string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs. [string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. [string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs. - [string] $GuardianLoggerLevel="Standard" # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error + [string] $GuardianLoggerLevel="Standard", # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error + [string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1") + [string[]] $PoliCheckAdditionalRunConfigParams # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1") ) $ErrorActionPreference = "Stop" @@ -69,10 +71,10 @@ if ($TsaOnboard) { } if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams } if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams } if ($UpdateBaseline) { diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index e6a86d03a21..d7b85644581 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -5,7 +5,9 @@ Param( [string] $GdnFolder, [string[]] $ToolsList, [string] $UpdateBaseline, - [string] $GuardianLoggerLevel="Standard" + [string] $GuardianLoggerLevel="Standard", + [string[]] $CrScanAdditionalRunConfigParams, + [string[]] $PoliCheckAdditionalRunConfigParams ) $ErrorActionPreference = "Stop" @@ -29,8 +31,8 @@ foreach ($tool in $ToolsList) { Write-Host $tool # We have to manually configure tools that run on source to look at the source directory only if ($tool -eq "credscan") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `"" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) if ($LASTEXITCODE -ne 0) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE @@ -38,8 +40,8 @@ foreach ($tool in $ToolsList) { $config = $True } if ($tool -eq "policheck") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `"" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams}) if ($LASTEXITCODE -ne 0) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE diff --git a/global.json b/global.json index 836e5eeb8ee..7d80440f328 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19352.7", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19352.7" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19353.19", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19353.19" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From a7070f052c921c0d63ec1e1d57abe70549bccdd9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2019 12:53:18 +0000 Subject: [PATCH 028/227] Update dependencies from https://github.com/dotnet/winforms build 20190703.4 (#1174) - Microsoft.Private.Winforms - 4.8.0-preview8.19353.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b471f759b9a..402f5d244cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 3b4f01820b1c677b3e8c73a4e869dda07795f3c9 + 522215c10ccdc2ae74ab265296ce288f29e892eb diff --git a/eng/Versions.props b/eng/Versions.props index f6161b841fc..1f6e86d582b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19352.6 + 4.8.0-preview8.19353.4 From 33df9e17964fbd74b938e5b44bc2c6f1cb078250 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2019 13:25:38 +0000 Subject: [PATCH 029/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190703.4 (#1175) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19353.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 402f5d244cd..7eb11699a61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 30e31f6027fd361c4def538334380fc2df6f5361 + 06deb719f94a714599e9da430552ea1cc538d510 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 1f6e86d582b..ae5720d9d21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19352.5 + 4.8.0-preview8.19353.4 From 157a961d8da446cb6fde791882579ffeb5938a59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2019 12:23:14 +0000 Subject: [PATCH 030/227] Update dependencies from https://github.com/dotnet/arcade build 20190704.2 (#1180) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19354.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19354.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19354.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19354.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19354.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7eb11699a61..ae550bafbad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 733f8297b68dd824044a77d955e62305b9dc43d5 + 30553c0de34454fb8da5229962501af65eb1233f - + https://github.com/dotnet/arcade - 733f8297b68dd824044a77d955e62305b9dc43d5 + 30553c0de34454fb8da5229962501af65eb1233f https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 733f8297b68dd824044a77d955e62305b9dc43d5 + 30553c0de34454fb8da5229962501af65eb1233f - + https://github.com/dotnet/arcade - 733f8297b68dd824044a77d955e62305b9dc43d5 + 30553c0de34454fb8da5229962501af65eb1233f - + https://github.com/dotnet/arcade - 733f8297b68dd824044a77d955e62305b9dc43d5 + 30553c0de34454fb8da5229962501af65eb1233f diff --git a/eng/Versions.props b/eng/Versions.props index ae5720d9d21..f9df605b934 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19353.19 - 1.0.0-beta.19353.19 - 1.0.0-beta.19353.19 + 1.0.0-beta.19354.2 + 1.0.0-beta.19354.2 + 1.0.0-beta.19354.2 diff --git a/global.json b/global.json index 7d80440f328..e4bb0f96ea3 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19353.19", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19353.19" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19354.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19354.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From f92cf9f7b32ace6aa815472b6ffb0d69d60f7751 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2019 13:15:40 +0000 Subject: [PATCH 031/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190704.4 (#1182) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19354.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae550bafbad..dcd94f804fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 06deb719f94a714599e9da430552ea1cc538d510 + ecd7d246a62a7a9705f3ff0038ab311fba011f77 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index f9df605b934..f3bfd3a9148 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19353.4 + 4.8.0-preview8.19354.4 From cc893476f2b80b5e7f0e960d59d21b45162c2b1b Mon Sep 17 00:00:00 2001 From: Dilip Ojha Date: Fri, 5 Jul 2019 17:28:40 -0700 Subject: [PATCH 032/227] Fix crash when copying from RichTextBox (#1068) * added internalencoding class * Update src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Text/InternalEncoding.cs Co-Authored-By: Christopher Watford * updated comment, minor change * added usage --- .../PresentationFramework.csproj | 2 ++ .../Controls/DataGridClipboardHelper.cs | 3 +- .../Windows/Documents/RtfToXamlLexer.cs | 7 +++-- .../Windows/Documents/RtfToXamlReader.cs | 5 +-- .../Windows/Documents/XamlToRtfWriter.cs | 7 +++-- .../MS/Internal/Text/InternalEncoding.cs | 31 +++++++++++++++++++ 6 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Text/InternalEncoding.cs diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index 4a66cb9f39f..11a38c78048 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -58,6 +58,7 @@ + @@ -1418,6 +1419,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/DataGridClipboardHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/DataGridClipboardHelper.cs index f3ec67ce172..cce1cf20382 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/DataGridClipboardHelper.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/DataGridClipboardHelper.cs @@ -9,6 +9,7 @@ using System.IO; using System.Text; using System.Windows; +using MS.Internal.Text; namespace System.Windows.Controls { @@ -84,7 +85,7 @@ internal static void GetClipboardContentForHtml(StringBuilder content) // There are characters in Asian languages which require more than 2 bytes for encoding into UTF-8 // Marshal.SystemDefaultCharSize is 2 and would not be appropriate in all cases. We have to explicitly calculate the number of bytes. byte[] sourceBytes = Encoding.Unicode.GetBytes(content.ToString()); - byte[] destinationBytes = Encoding.Convert(Encoding.Unicode, Encoding.UTF8, sourceBytes); + byte[] destinationBytes = InternalEncoding.Convert(Encoding.Unicode, Encoding.UTF8, sourceBytes); int bytecountEndOfFragment = bytecountPrefixContext + destinationBytes.Length; int bytecountEndOfHtml = bytecountEndOfFragment + bytecountSuffixContext; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlLexer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlLexer.cs index f166dff15d1..5c0ef9a8a48 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlLexer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlLexer.cs @@ -10,7 +10,8 @@ using System.Diagnostics; using System.Globalization; using System.Text; -using System.IO; // Stream +using System.IO; // Stream +using MS.Internal.Text; namespace System.Windows.Documents { @@ -35,7 +36,7 @@ internal RtfToXamlLexer(byte[] rtfBytes) _rtfBytes = rtfBytes; _currentCodePage = CultureInfo.CurrentCulture.TextInfo.ANSICodePage; - _currentEncoding = Encoding.GetEncoding(_currentCodePage); + _currentEncoding = InternalEncoding.GetEncoding(_currentCodePage); } #endregion Constructors @@ -300,7 +301,7 @@ internal int CodePage if (_currentCodePage != value) { _currentCodePage = value; - _currentEncoding = Encoding.GetEncoding(_currentCodePage); + _currentEncoding = InternalEncoding.GetEncoding(_currentCodePage); } } } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs index 102fadd38e2..2b000132d13 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs @@ -14,6 +14,7 @@ using System.Windows.Media; // Color using Microsoft.Win32; // Registry for font substitutes using MS.Internal; // Invariant +using MS.Internal.Text; namespace System.Windows.Documents @@ -3444,7 +3445,7 @@ internal void ComputePreferredCodePage() for (int i = 0; i < CodePageList.Length; i++) { - Encoding e = Encoding.GetEncoding(CodePageList[i]); + Encoding e = InternalEncoding.GetEncoding(CodePageList[i]); int cb = e.GetBytes(Name, 0, Name.Length, rgBytes, 0); int cch = e.GetChars(rgBytes, 0, cb, rgChars, 0); @@ -8844,7 +8845,7 @@ private void ConvertSymbolCharValueToText(DocumentNode dn, int nChar, EncodeType if (nChar < 0xFFFF) { // NB: How to interpret this numeric value as Shift-JIS? - Encoding ec = Encoding.GetEncoding(932); + Encoding ec = InternalEncoding.GetEncoding(932); int nChars = nChar > 256 ? 2 : 1; byte[] ba = new byte[2]; if (nChars == 1) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs index c7c6447751a..615130cb0e4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs @@ -13,6 +13,7 @@ using System.Globalization; using System.IO; using MS.Internal.Globalization; +using MS.Internal.Text; #if WindowsMetaFile // GetWinMetaFileBits using System.Runtime.InteropServices; @@ -2206,7 +2207,7 @@ private string ConvertToImageHexDataString(byte[] imageBytes) } // Return the image hex data string that is the default image data type on Rtf - return Encoding.GetEncoding(XamlRtfConverter.RtfCodePage).GetString(imageHexBytes); + return InternalEncoding.GetEncoding(XamlRtfConverter.RtfCodePage).GetString(imageHexBytes); } #endif // WindowsMetaFile @@ -2227,7 +2228,7 @@ private string ConvertToImageHexDataString(Stream imageStream) } // Return the image hex data string that is the default image data type on Rtf - return Encoding.GetEncoding(XamlRtfConverter.RtfCodePage).GetString(imageHexBytes); + return InternalEncoding.GetEncoding(XamlRtfConverter.RtfCodePage).GetString(imageHexBytes); } // Get the image type from image source name @@ -4023,7 +4024,7 @@ private static void AppendRtfUnicodeChar(StringBuilder sb, char c, int cp, ref E { if (e == null) { - e = Encoding.GetEncoding(cp); + e = InternalEncoding.GetEncoding(cp); } int cb = e.GetBytes(new char[] { c }, 0, 1, rgAnsi, 0); int cch = e.GetChars(rgAnsi, 0, cb, rgChar, 0); diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Text/InternalEncoding.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Text/InternalEncoding.cs new file mode 100644 index 00000000000..02dc17dc181 --- /dev/null +++ b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Text/InternalEncoding.cs @@ -0,0 +1,31 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Text; + +namespace MS.Internal.Text +{ + /// + /// We use encodings that are not provided by default in core. + /// This class makes sure that we register extra providers that are required before use. + /// + internal static class InternalEncoding + { + + static InternalEncoding() + { + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + } + + internal static Encoding GetEncoding(int codepage) + { + return Encoding.GetEncoding(codepage); + } + + internal static byte[] Convert(System.Text.Encoding srcEncoding, System.Text.Encoding dstEncoding, byte[] bytes) + { + return Encoding.Convert(srcEncoding, dstEncoding, bytes); + } + } +} From bc970df1fc2a41157c2115f0a7a967ced8755350 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2019 12:21:01 +0000 Subject: [PATCH 033/227] Update dependencies from https://github.com/dotnet/arcade build 20190705.2 (#1185) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19355.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19355.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19355.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19355.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19355.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcd94f804fe..6fb231a43e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 30553c0de34454fb8da5229962501af65eb1233f + 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f - + https://github.com/dotnet/arcade - 30553c0de34454fb8da5229962501af65eb1233f + 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 30553c0de34454fb8da5229962501af65eb1233f + 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f - + https://github.com/dotnet/arcade - 30553c0de34454fb8da5229962501af65eb1233f + 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f - + https://github.com/dotnet/arcade - 30553c0de34454fb8da5229962501af65eb1233f + 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f diff --git a/eng/Versions.props b/eng/Versions.props index f3bfd3a9148..b37fb520b56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19354.2 - 1.0.0-beta.19354.2 - 1.0.0-beta.19354.2 + 1.0.0-beta.19355.2 + 1.0.0-beta.19355.2 + 1.0.0-beta.19355.2 diff --git a/global.json b/global.json index e4bb0f96ea3..4bf1dc95c7f 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19354.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19354.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19355.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19355.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 40a95619a41ea2c14e4d3c4ba14c5e1acd9f8301 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2019 13:14:53 +0000 Subject: [PATCH 034/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190705.4 (#1186) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19355.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fb231a43e6..68fb904b87f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - ecd7d246a62a7a9705f3ff0038ab311fba011f77 + 5f1305253ae198b776b388f3df7daa747970bb85 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index b37fb520b56..bcda4e7d6ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19354.4 + 4.8.0-preview8.19355.4 From 18aca17dc48687db0d0f3586897f03469d62b21b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2019 12:21:29 +0000 Subject: [PATCH 035/227] Update dependencies from https://github.com/dotnet/arcade build 20190706.1 (#1187) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19356.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19356.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19356.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19356.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19356.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68fb904b87f..abb60245576 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f + a65d0966dc28861394ce78cfdcb9d5dff370957c - + https://github.com/dotnet/arcade - 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f + a65d0966dc28861394ce78cfdcb9d5dff370957c https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f + a65d0966dc28861394ce78cfdcb9d5dff370957c - + https://github.com/dotnet/arcade - 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f + a65d0966dc28861394ce78cfdcb9d5dff370957c - + https://github.com/dotnet/arcade - 3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f + a65d0966dc28861394ce78cfdcb9d5dff370957c diff --git a/eng/Versions.props b/eng/Versions.props index bcda4e7d6ee..218b283e8d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19355.2 - 1.0.0-beta.19355.2 - 1.0.0-beta.19355.2 + 1.0.0-beta.19356.1 + 1.0.0-beta.19356.1 + 1.0.0-beta.19356.1 diff --git a/global.json b/global.json index 4bf1dc95c7f..b9b200c710f 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19355.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19355.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19356.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19356.1" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 0cb1317b122f502f88b976dd91cadecc38136ee4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2019 13:07:59 +0000 Subject: [PATCH 036/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190706.3 (#1188) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19356.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abb60245576..9f6fb38c74f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 5f1305253ae198b776b388f3df7daa747970bb85 + e287ffe372f7d84dcf1daedc0cecb8e0ddba18c3 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 218b283e8d7..ecbdac08739 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19355.4 + 4.8.0-preview8.19356.3 From 142347d658d8b6ca578f3b6d216a277e5eb936d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2019 12:21:35 +0000 Subject: [PATCH 037/227] Update dependencies from https://github.com/dotnet/arcade build 20190708.1 (#1189) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19358.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19358.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19358.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19358.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19358.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f6fb38c74f..6d8a06693c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - a65d0966dc28861394ce78cfdcb9d5dff370957c + 4953cdf6c956adf69a0050c4df503048aed6b271 - + https://github.com/dotnet/arcade - a65d0966dc28861394ce78cfdcb9d5dff370957c + 4953cdf6c956adf69a0050c4df503048aed6b271 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - a65d0966dc28861394ce78cfdcb9d5dff370957c + 4953cdf6c956adf69a0050c4df503048aed6b271 - + https://github.com/dotnet/arcade - a65d0966dc28861394ce78cfdcb9d5dff370957c + 4953cdf6c956adf69a0050c4df503048aed6b271 - + https://github.com/dotnet/arcade - a65d0966dc28861394ce78cfdcb9d5dff370957c + 4953cdf6c956adf69a0050c4df503048aed6b271 diff --git a/eng/Versions.props b/eng/Versions.props index ecbdac08739..3e19c9748f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19356.1 - 1.0.0-beta.19356.1 - 1.0.0-beta.19356.1 + 1.0.0-beta.19358.1 + 1.0.0-beta.19358.1 + 1.0.0-beta.19358.1 diff --git a/global.json b/global.json index b9b200c710f..85dd3d92b50 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19356.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19356.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19358.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19358.1" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 1d297b23024e7e616c4f360f0c7e3e32d63fa4d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2019 12:48:59 +0000 Subject: [PATCH 038/227] [master] Update dependencies from dotnet/winforms (#1181) * Update dependencies from https://github.com/dotnet/winforms build 20190704.1 - Microsoft.Private.Winforms - 4.8.0-preview8.19354.1 * Update dependencies from https://github.com/dotnet/winforms build 20190707.2 - Microsoft.Private.Winforms - 4.8.0-preview8.19357.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d8a06693c7..738c0537b93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 522215c10ccdc2ae74ab265296ce288f29e892eb + 296b72f5cce95bc25f924a458dfced4dcb2473e2 diff --git a/eng/Versions.props b/eng/Versions.props index 3e19c9748f8..35e3e477fc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19353.4 + 4.8.0-preview8.19357.2 From 008e1bb07cef9c701b4c3a976eca41509efd93ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2019 13:16:41 +0000 Subject: [PATCH 039/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190707.3 (#1190) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19357.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 738c0537b93..7baf48292c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - e287ffe372f7d84dcf1daedc0cecb8e0ddba18c3 + f48db94ae9617a7105ec3f2f3446eb86182ccdaf https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 35e3e477fc4..6afa2d51339 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19356.3 + 4.8.0-preview8.19357.3 From 8cbbed89bb3a402e66529850f004244bd7493dae Mon Sep 17 00:00:00 2001 From: Dilip Ojha Date: Mon, 8 Jul 2019 14:38:14 -0700 Subject: [PATCH 040/227] added package reference --- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj index 3ccca354fd9..cf991d26a39 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -121,6 +121,7 @@ + From 5e2530811287f16d0f6243ed40e38d28be411857 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2019 12:21:36 +0000 Subject: [PATCH 041/227] Update dependencies from https://github.com/dotnet/arcade build 20190709.1 (#1193) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19359.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19359.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19359.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19359.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19359.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7baf48292c8..1681d45bcee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e1d780539e85f4d8de263957715f9d08db2ceef4 - + https://github.com/dotnet/arcade - 4953cdf6c956adf69a0050c4df503048aed6b271 + ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/arcade - 4953cdf6c956adf69a0050c4df503048aed6b271 + ef3834feb8615429a58808cdcf9ad9284d767654 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 8974a699899bdc2cc5687504e1ada606ac803e9b - + https://github.com/dotnet/arcade - 4953cdf6c956adf69a0050c4df503048aed6b271 + ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/arcade - 4953cdf6c956adf69a0050c4df503048aed6b271 + ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/arcade - 4953cdf6c956adf69a0050c4df503048aed6b271 + ef3834feb8615429a58808cdcf9ad9284d767654 diff --git a/eng/Versions.props b/eng/Versions.props index 6afa2d51339..d3cc2410ec4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19358.1 - 1.0.0-beta.19358.1 - 1.0.0-beta.19358.1 + 1.0.0-beta.19359.1 + 1.0.0-beta.19359.1 + 1.0.0-beta.19359.1 diff --git a/global.json b/global.json index 85dd3d92b50..b2d5c8255d4 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19358.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19358.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19359.1" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From c08800e357cf583e14a2057e4ee6b4d29bf9c32d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2019 12:45:56 +0000 Subject: [PATCH 042/227] Update dependencies from https://github.com/dotnet/winforms build 20190708.1 (#1194) - Microsoft.Private.Winforms - 4.8.0-preview8.19358.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1681d45bcee..b512632e27e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 296b72f5cce95bc25f924a458dfced4dcb2473e2 + 483ac17dd68c7fffc339b825ae059a50ccbab8a3 diff --git a/eng/Versions.props b/eng/Versions.props index d3cc2410ec4..a01ba91a0b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19357.2 + 4.8.0-preview8.19358.1 From 20cd2961389354886a5df7f455e162ae427ffb70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2019 13:17:02 +0000 Subject: [PATCH 043/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190708.7 (#1195) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19358.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b512632e27e..7c6c4dd3842 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 468355e66daf9eaeb1978703fa6365cd1e37e644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - f48db94ae9617a7105ec3f2f3446eb86182ccdaf + b5bc9638f43e365197136f3724a81e5131b1ce6c https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index a01ba91a0b3..cf2c8ec3418 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19357.3 + 4.8.0-preview8.19358.7 From ea72094ebe0de0da03c591752559739d6fb67f03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2019 21:01:33 +0000 Subject: [PATCH 044/227] Update dependencies from https://github.com/dotnet/winforms build 20190709.1 (#1197) - Microsoft.Private.Winforms - 4.8.0-preview8.19359.1 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19358.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19358.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19358.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19358.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c6c4dd3842..c6d1458a8f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 483ac17dd68c7fffc339b825ae059a50ccbab8a3 + bd1ec4e2cdab8e536cdb48670843904310a1854a - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/core-setup - e1d780539e85f4d8de263957715f9d08db2ceef4 + 705a6d8ce1a073d58fffa8ab9f25a7b8112d6b6b https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int b5bc9638f43e365197136f3724a81e5131b1ce6c - + https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b + 085398b5c6913b03180c855f56b967e2a7d6edde - + https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b + 085398b5c6913b03180c855f56b967e2a7d6edde - + https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b + 085398b5c6913b03180c855f56b967e2a7d6edde https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index cf2c8ec3418..aab10c5fc98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview7.19320.1 + 4.6.0-preview8.19358.6 - 4.8.0-preview8.19358.1 + 4.8.0-preview8.19359.1 - 3.0.0-preview7.19323.2 - 3.0.0-preview7.19323.2 - 3.0.0-preview7.19323.2 + 3.0.0-preview8.19358.1 + 3.0.0-preview8.19358.1 + 3.0.0-preview8.19358.1 - 3.0.0-preview7-27824-03 - 3.0.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 + 3.0.0-preview8-27909-01 + 3.0.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 4.6.0-preview4.19176.11 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 From b7290019606208372224272f6394b7608303ac4e Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Tue, 9 Jul 2019 14:21:54 -0700 Subject: [PATCH 045/227] Add System.Windows.Extensions Package Reference Add System.Windows.Extensions PackageReference to System.Xaml-ref.csproj --- .../src/System.Xaml/ref/System.Xaml-ref.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj index b068208c3e1..637e4ca0dc2 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj @@ -50,5 +50,6 @@ + From d23fb2fed20f0e7d5b5e88b697e1cb49c9f7acaf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 02:55:50 +0000 Subject: [PATCH 046/227] Update dependencies from https://github.com/dotnet/winforms build 20190709.3 (#1201) - Microsoft.Private.Winforms - 4.8.0-preview8.19359.3 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6d1458a8f5..ccc5008e459 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - bd1ec4e2cdab8e536cdb48670843904310a1854a + 0af6f9038fba02b9a0241f2e8b185c65ed3f8d38 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/core-setup - 705a6d8ce1a073d58fffa8ab9f25a7b8112d6b6b + 03e479ef962676272bc9e2028ff06f48315a1be6 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int b5bc9638f43e365197136f3724a81e5131b1ce6c - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index aab10c5fc98..9a6e0b84fed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19358.6 + 4.6.0-preview8.19359.4 - 4.8.0-preview8.19359.1 + 4.8.0-preview8.19359.3 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27909-01 - 3.0.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 + 3.0.0-preview8-27909-07 + 3.0.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 4.6.0-preview4.19176.11 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 From 1b2066879ebd5574e7b10c680c69e16bb543483c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 03:20:54 +0000 Subject: [PATCH 047/227] Update dependencies from https://github.com/dotnet/winforms build 20190709.2 (#1202) - Microsoft.Private.Winforms - 4.8.0-preview8.19359.2 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19358.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-01 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccc5008e459..f79d185bddc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 0af6f9038fba02b9a0241f2e8b185c65ed3f8d38 + 2f0e41f0677a243ebe1354945f2869c85b7ffbd9 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 - + https://github.com/dotnet/core-setup - 03e479ef962676272bc9e2028ff06f48315a1be6 + 705a6d8ce1a073d58fffa8ab9f25a7b8112d6b6b https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int b5bc9638f43e365197136f3724a81e5131b1ce6c - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 9a6e0b84fed..5461130c9ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19359.4 + 4.6.0-preview8.19358.6 - 4.8.0-preview8.19359.3 + 4.8.0-preview8.19359.2 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27909-07 - 3.0.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 + 3.0.0-preview8-27909-01 + 3.0.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 4.6.0-preview4.19176.11 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 + 4.6.0-preview8.19358.6 From b63c664180a57a58c5ebb250e8ed2d6fa086b373 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 05:05:09 +0000 Subject: [PATCH 048/227] Update dependencies from https://github.com/dotnet/winforms build 20190709.5 (#1203) - Microsoft.Private.Winforms - 4.8.0-preview8.19359.5 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19359.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f79d185bddc..b8eab10086a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 2f0e41f0677a243ebe1354945f2869c85b7ffbd9 + 7c663fa1efccc372b8c9c76c8ed6d38dc9608000 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 - + https://github.com/dotnet/core-setup - 705a6d8ce1a073d58fffa8ab9f25a7b8112d6b6b + 03e479ef962676272bc9e2028ff06f48315a1be6 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int b5bc9638f43e365197136f3724a81e5131b1ce6c - + https://github.com/dotnet/corefx - bfa7b12fb8a3424e4bc5c6e553d9999bb605d397 + ef5834c78b088b778bf968a274eca25c6967afe6 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 5461130c9ec..97bf63fb19d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19358.6 + 4.6.0-preview8.19359.4 - 4.8.0-preview8.19359.2 + 4.8.0-preview8.19359.5 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27909-01 - 3.0.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 + 3.0.0-preview8-27909-07 + 3.0.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 4.6.0-preview4.19176.11 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 - 4.6.0-preview8.19358.6 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.4 From f6896ab8046c1f63b168d162f549f1185bcb9ad1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 05:26:06 +0000 Subject: [PATCH 049/227] Update dependencies from https://github.com/dotnet/winforms build 20190709.6 (#1204) - Microsoft.Private.Winforms - 4.8.0-preview8.19359.6 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19359.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19359.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19359.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19359.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19359.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-09 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8eab10086a..07a9748167f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 7c663fa1efccc372b8c9c76c8ed6d38dc9608000 + 24c54372a05ba9312685c4497ea57dda0468b167 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/core-setup - 03e479ef962676272bc9e2028ff06f48315a1be6 + 2d32b0e5e29045adc0ee6941faa12abcaff55122 https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int b5bc9638f43e365197136f3724a81e5131b1ce6c - + https://github.com/dotnet/corefx - ef5834c78b088b778bf968a274eca25c6967afe6 + 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 - + https://github.com/dotnet/coreclr - 085398b5c6913b03180c855f56b967e2a7d6edde + 48ff0937552e540f21835391b693daf47ffabece - + https://github.com/dotnet/coreclr - 085398b5c6913b03180c855f56b967e2a7d6edde + 48ff0937552e540f21835391b693daf47ffabece - + https://github.com/dotnet/coreclr - 085398b5c6913b03180c855f56b967e2a7d6edde + 48ff0937552e540f21835391b693daf47ffabece https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 97bf63fb19d..f6d3e058b9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.9 - 4.8.0-preview8.19359.5 + 4.8.0-preview8.19359.6 - 3.0.0-preview8.19358.1 - 3.0.0-preview8.19358.1 - 3.0.0-preview8.19358.1 + 3.0.0-preview8.19359.2 + 3.0.0-preview8.19359.2 + 3.0.0-preview8.19359.2 - 3.0.0-preview8-27909-07 - 3.0.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 + 3.0.0-preview8-27909-09 + 3.0.0-preview8.19359.9 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 4.6.0-preview4.19176.11 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 - 4.6.0-preview8.19359.4 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.9 From 3a5c0526ee5bb73c3489f4b3bd9b66623cfaea46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 06:40:54 +0000 Subject: [PATCH 050/227] Update dependencies from https://github.com/dotnet/winforms build 20190709.7 (#1205) - Microsoft.Private.Winforms - 4.8.0-preview8.19359.7 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19359.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-10 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07a9748167f..d76f9d05c21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 24c54372a05ba9312685c4497ea57dda0468b167 + 42feb52379586a79f859450ae0526c87da77b15f - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/core-setup - 2d32b0e5e29045adc0ee6941faa12abcaff55122 + 632f724697945492d02ec05743653b29fc67c6ca https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade ef3834feb8615429a58808cdcf9ad9284d767654 - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int b5bc9638f43e365197136f3724a81e5131b1ce6c - + https://github.com/dotnet/corefx - 75ae0a9a0ccf29854080ee0fecc1f54f69a65b56 + b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index f6d3e058b9b..5932898ac0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.11 - 4.8.0-preview8.19359.6 + 4.8.0-preview8.19359.7 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27909-09 - 3.0.0-preview8.19359.9 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 + 3.0.0-preview8-27909-10 + 3.0.0-preview8.19359.11 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 4.6.0-preview4.19176.11 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 - 4.6.0-preview8.19359.9 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 + 4.6.0-preview8.19359.11 From 48ffd18274b15e43b854948a2181aff7d82bdb8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 08:05:51 +0000 Subject: [PATCH 051/227] Update dependencies from https://github.com/dotnet/winforms build 20190709.8 (#1206) - Microsoft.Private.Winforms - 4.8.0-preview8.19359.8 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27909-11 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d76f9d05c21..1c9cfb6ec82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 42feb52379586a79f859450ae0526c87da77b15f + 98c7ca7231743934f06d8e8acecb6862a606f198 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/core-setup - 632f724697945492d02ec05743653b29fc67c6ca + 552dba193c0f21a03687d2f14861c7a4dcf8dd0f https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 5932898ac0d..730dd46181b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19359.7 + 4.8.0-preview8.19359.8 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27909-10 + 3.0.0-preview8-27909-11 3.0.0-preview8.19359.11 4.6.0-preview8.19359.11 4.6.0-preview8.19359.11 From cc18135b338bb0d6353b886f688fed0287f5ed8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 10:00:53 +0000 Subject: [PATCH 052/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.1 (#1207) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c9cfb6ec82..a149098cd9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 98c7ca7231743934f06d8e8acecb6862a606f198 + d2884026c1a45b75fa4ce4f479b36898f4fd9327 diff --git a/eng/Versions.props b/eng/Versions.props index 730dd46181b..df34394888a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19359.8 + 4.8.0-preview8.19360.1 From d2f1807afd1187290dceb8d8af4ddecc3112bc82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 11:15:50 +0000 Subject: [PATCH 053/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.2 (#1208) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.2 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-01 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a149098cd9a..fb694b15bc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - d2884026c1a45b75fa4ce4f479b36898f4fd9327 + 6934cca465296c8c62437d3979eb3b5ca43f8721 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/core-setup - 552dba193c0f21a03687d2f14861c7a4dcf8dd0f + 5cd0245860335e0b307f6a46b99c6f9244887318 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index df34394888a..3c11b81cf2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19360.1 + 4.8.0-preview8.19360.2 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27909-11 + 3.0.0-preview8-27910-01 3.0.0-preview8.19359.11 4.6.0-preview8.19359.11 4.6.0-preview8.19359.11 From 3b0ab874fe1558900ff44bf93ba8dc5a8b8f0176 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 12:16:08 +0000 Subject: [PATCH 054/227] Update dependencies from https://github.com/dotnet/arcade build 20190709.6 (#1210) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19359.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19359.6 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19359.6 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19359.6 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19359.6 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb694b15bc7..128a3ee15fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 5cd0245860335e0b307f6a46b99c6f9244887318 - + https://github.com/dotnet/arcade - ef3834feb8615429a58808cdcf9ad9284d767654 + 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/arcade - ef3834feb8615429a58808cdcf9ad9284d767654 + 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 48ff0937552e540f21835391b693daf47ffabece - + https://github.com/dotnet/arcade - ef3834feb8615429a58808cdcf9ad9284d767654 + 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/arcade - ef3834feb8615429a58808cdcf9ad9284d767654 + 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/arcade - ef3834feb8615429a58808cdcf9ad9284d767654 + 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f diff --git a/eng/Versions.props b/eng/Versions.props index 3c11b81cf2d..015232c67be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19359.1 - 1.0.0-beta.19359.1 - 1.0.0-beta.19359.1 + 1.0.0-beta.19359.6 + 1.0.0-beta.19359.6 + 1.0.0-beta.19359.6 diff --git a/global.json b/global.json index b2d5c8255d4..4b7be474abb 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19359.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.6", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19359.6" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 2ab7161711661e48e5b4feb3099cddb8f3155bc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 13:10:42 +0000 Subject: [PATCH 055/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190709.6 (#1211) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19359.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 128a3ee15fa..92e37990333 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - b5bc9638f43e365197136f3724a81e5131b1ce6c + ae34b415d3e316af02bd0a3898a04dd19a7a4c9d https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 015232c67be..3f0688e3b72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19358.7 + 4.8.0-preview8.19359.6 From 520d19de1eb08d8384c8d18d8dd0dc2127a951b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 16:20:53 +0000 Subject: [PATCH 056/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.4 (#1212) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-02 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92e37990333..e0f116d69fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 6934cca465296c8c62437d3979eb3b5ca43f8721 + ed029bafcbb241bf67efa375bad289d85d55ea8a @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/core-setup - 5cd0245860335e0b307f6a46b99c6f9244887318 + c49ce134b4f12ac1510ee2986dd2a7cf53ce0ead https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3f0688e3b72..bc3f3d55055 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19360.2 + 4.8.0-preview8.19360.4 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27910-01 + 3.0.0-preview8-27910-02 3.0.0-preview8.19359.11 4.6.0-preview8.19359.11 4.6.0-preview8.19359.11 From e770fd2305db99a99083972c5db0716bce1f3c4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 18:00:52 +0000 Subject: [PATCH 057/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.5 (#1213) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.5 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19360.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19360.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19360.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19360.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-03 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0f116d69fe..2bf531fc2d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - ed029bafcbb241bf67efa375bad289d85d55ea8a + c42f0ca12fde4be80b3ec30921747ef87a4326b0 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/core-setup - c49ce134b4f12ac1510ee2986dd2a7cf53ce0ead + 7a43bc15505447fcbd79e544e41fd212dd447bcf https://github.com/dotnet/arcade @@ -83,17 +83,17 @@ https://github.com/dotnet/corefx b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 - + https://github.com/dotnet/coreclr - 48ff0937552e540f21835391b693daf47ffabece + d61a380bbfde580986f416d8bf3e687104cd5701 - + https://github.com/dotnet/coreclr - 48ff0937552e540f21835391b693daf47ffabece + d61a380bbfde580986f416d8bf3e687104cd5701 - + https://github.com/dotnet/coreclr - 48ff0937552e540f21835391b693daf47ffabece + d61a380bbfde580986f416d8bf3e687104cd5701 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index bc3f3d55055..2a57dd7b533 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ - 4.8.0-preview8.19360.4 + 4.8.0-preview8.19360.5 - 3.0.0-preview8.19359.2 - 3.0.0-preview8.19359.2 - 3.0.0-preview8.19359.2 + 3.0.0-preview8.19360.1 + 3.0.0-preview8.19360.1 + 3.0.0-preview8.19360.1 - 3.0.0-preview8-27910-02 + 3.0.0-preview8-27910-03 3.0.0-preview8.19359.11 4.6.0-preview8.19359.11 4.6.0-preview8.19359.11 From 9ae155cd6488430272cedd8f8d8560da167d2477 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2019 19:40:53 +0000 Subject: [PATCH 058/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.7 (#1214) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.7 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19360.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-05 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bf531fc2d0..6b41fb276e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - c42f0ca12fde4be80b3ec30921747ef87a4326b0 + ad8b3a006e1bf1ec52448ac1113a51655a043df4 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 - + https://github.com/dotnet/core-setup - 7a43bc15505447fcbd79e544e41fd212dd447bcf + 7b681705241608e9154b5c1dbbaf2bc50bfb5055 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int ae34b415d3e316af02bd0a3898a04dd19a7a4c9d - + https://github.com/dotnet/corefx - b6edaf0ac1ca42b48fd6c836f9bb472090d832a8 + 1a26c1617216c078e725ed0a697b93e2cc5d3074 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 2a57dd7b533..88db100fe87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19359.11 + 4.6.0-preview8.19360.3 - 4.8.0-preview8.19360.5 + 4.8.0-preview8.19360.7 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27910-03 - 3.0.0-preview8.19359.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 + 3.0.0-preview8-27910-05 + 3.0.0-preview8.19360.3 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 4.6.0-preview4.19176.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 - 4.6.0-preview8.19359.11 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.3 From 2e787e123dca40c861406a0b18da3d9e6ad1a1f0 Mon Sep 17 00:00:00 2001 From: Dilip Ojha Date: Wed, 10 Jul 2019 13:52:41 -0700 Subject: [PATCH 059/227] Fix for Relative Uri's in Flowdocument being broken (#1140) * fixed test * deleted comment --- .../System/Windows/Documents/FixedPage.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedPage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedPage.cs index ac580a2350f..d831d8a2feb 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedPage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedPage.cs @@ -614,10 +614,7 @@ internal static Uri GetLinkUri(IInputElement element, Uri inputUri) DependencyObject dpo = element as DependencyObject; Debug.Assert(dpo != null, "GetLinkUri shouldn't be called for non-DependencyObjects."); - if (inputUri != null && - (inputUri.Scheme == PackUriHelper.UriSchemePack && !String.IsNullOrEmpty(inputUri.Fragment))) - // We want to allow navigation to pack:// Uris as we may get these from automation, but we - // wouldn't support this if an actual Uri were given as a pack:// Uri + if (inputUri != null) { // // First remove the fragment, this is to prevent escape in file URI case, for example, From b0f1279f4acf69e7c7f1c295d4957d6ea1785183 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 00:55:51 +0000 Subject: [PATCH 060/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.9 (#1215) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.9 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19360.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b41fb276e7..516f54cba24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - ad8b3a006e1bf1ec52448ac1113a51655a043df4 + 9e84fa7a3b9771f8b3dbd172e5ddfc8c369fcc97 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 - + https://github.com/dotnet/core-setup - 7b681705241608e9154b5c1dbbaf2bc50bfb5055 + f072f68e17667211c07ffe3247ac529cd720d77f https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int ae34b415d3e316af02bd0a3898a04dd19a7a4c9d - + https://github.com/dotnet/corefx - 1a26c1617216c078e725ed0a697b93e2cc5d3074 + 20da9da94cc7d3c77e7c505430e6284a96a21ff1 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 88db100fe87..6c43e67b1fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.4 - 4.8.0-preview8.19360.7 + 4.8.0-preview8.19360.9 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27910-05 - 3.0.0-preview8.19360.3 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 + 3.0.0-preview8-27910-07 + 3.0.0-preview8.19360.4 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 4.6.0-preview4.19176.11 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 - 4.6.0-preview8.19360.3 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.4 From fa16351da93d3a7fc7c911b97cc3036bc612c43d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 01:30:09 +0000 Subject: [PATCH 061/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.8 (#1216) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 516f54cba24..1a593d7f22e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 9e84fa7a3b9771f8b3dbd172e5ddfc8c369fcc97 + 294e9b64f88bdf2f8c8322b0b6d908462fcf6e46 diff --git a/eng/Versions.props b/eng/Versions.props index 6c43e67b1fe..dcbf8de69e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19360.9 + 4.8.0-preview8.19360.8 From 544a7777773c9a1a9e2ed875528346504a8e161e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 01:50:02 +0000 Subject: [PATCH 062/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.10 (#1217) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a593d7f22e..40e2345984a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 294e9b64f88bdf2f8c8322b0b6d908462fcf6e46 + 2b53be986875a72b226c7bcaaf796a09de7ab16e diff --git a/eng/Versions.props b/eng/Versions.props index dcbf8de69e0..f6373da4e2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19360.8 + 4.8.0-preview8.19360.10 From 05896063170e31b5e4c032459166e1bfb4f45a72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 02:10:57 +0000 Subject: [PATCH 063/227] [master] Update dependencies from dotnet/winforms (#1218) * Update dependencies from https://github.com/dotnet/winforms build 20190710.12 - Microsoft.Private.Winforms - 4.8.0-preview8.19360.12 * Update dependencies from https://github.com/dotnet/winforms build 20190710.11 - Microsoft.Private.Winforms - 4.8.0-preview8.19360.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40e2345984a..24c69151c4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 2b53be986875a72b226c7bcaaf796a09de7ab16e + b2e2ccbd9ed9fadfb74a7052e8875a3461861a3c diff --git a/eng/Versions.props b/eng/Versions.props index f6373da4e2e..a9bf6654cab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19360.10 + 4.8.0-preview8.19360.11 From 92cb5e2b6c9d02bb4fb1911c348633afafaacded Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 02:40:55 +0000 Subject: [PATCH 064/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.13 (#1219) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.13 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24c69151c4c..55d225f58d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - b2e2ccbd9ed9fadfb74a7052e8875a3461861a3c + 25429c5514b71847e934a4f40b08483242d59ec4 diff --git a/eng/Versions.props b/eng/Versions.props index a9bf6654cab..7cfe3d54d47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19360.11 + 4.8.0-preview8.19360.13 From 9ee413767d1bc4c43de7a1dfe8d9efcbca770da3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 03:10:52 +0000 Subject: [PATCH 065/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.14 (#1220) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.14 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19360.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-09 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55d225f58d0..22c40e7bf69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 25429c5514b71847e934a4f40b08483242d59ec4 + 058ce5852b52aba646e6d06cbf8a7aaddbbe9e6d - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 - + https://github.com/dotnet/core-setup - f072f68e17667211c07ffe3247ac529cd720d77f + 8a169a4c4eabd25ff8d009613d9f83f8b4d13248 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int ae34b415d3e316af02bd0a3898a04dd19a7a4c9d - + https://github.com/dotnet/corefx - 20da9da94cc7d3c77e7c505430e6284a96a21ff1 + 5e44821bd670530cd2bf1dd330079f6e2d8e5284 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 7cfe3d54d47..85624bce324 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.6 - 4.8.0-preview8.19360.13 + 4.8.0-preview8.19360.14 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27910-07 - 3.0.0-preview8.19360.4 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 + 3.0.0-preview8-27910-09 + 3.0.0-preview8.19360.6 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 4.6.0-preview4.19176.11 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 - 4.6.0-preview8.19360.4 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.6 From cbec9fcb67037b3df3fd2c4d11d50cbbd8ee707b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 06:20:48 +0000 Subject: [PATCH 066/227] Update dependencies from https://github.com/dotnet/winforms build 20190710.15 (#1221) - Microsoft.Private.Winforms - 4.8.0-preview8.19360.15 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19360.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19360.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19360.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19360.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19360.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-11 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22c40e7bf69..03dc91f7c42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 058ce5852b52aba646e6d06cbf8a7aaddbbe9e6d + 2e4604a25c9fcbb18e0d844fc139b2756d723a31 - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/core-setup - 8a169a4c4eabd25ff8d009613d9f83f8b4d13248 + d6f8dd9f1f304a28faf3a4f064fee0e45710f6b8 https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int ae34b415d3e316af02bd0a3898a04dd19a7a4c9d - + https://github.com/dotnet/corefx - 5e44821bd670530cd2bf1dd330079f6e2d8e5284 + 1247fa7a193e52bc89bc49c4ba6e44739df2dcee - + https://github.com/dotnet/coreclr - d61a380bbfde580986f416d8bf3e687104cd5701 + ef2f9f41555c453451a5003f1be4bb9888ab078d - + https://github.com/dotnet/coreclr - d61a380bbfde580986f416d8bf3e687104cd5701 + ef2f9f41555c453451a5003f1be4bb9888ab078d - + https://github.com/dotnet/coreclr - d61a380bbfde580986f416d8bf3e687104cd5701 + ef2f9f41555c453451a5003f1be4bb9888ab078d https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 85624bce324..a0538e7f321 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.7 - 4.8.0-preview8.19360.14 + 4.8.0-preview8.19360.15 - 3.0.0-preview8.19360.1 - 3.0.0-preview8.19360.1 - 3.0.0-preview8.19360.1 + 3.0.0-preview8.19360.2 + 3.0.0-preview8.19360.2 + 3.0.0-preview8.19360.2 - 3.0.0-preview8-27910-09 - 3.0.0-preview8.19360.6 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 + 3.0.0-preview8-27910-11 + 3.0.0-preview8.19360.7 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 4.6.0-preview4.19176.11 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 - 4.6.0-preview8.19360.6 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.7 From b7be8a2053154139c627a541649749bc10117507 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 08:15:54 +0000 Subject: [PATCH 067/227] Update dependencies from https://github.com/dotnet/winforms build 20190711.1 (#1222) - Microsoft.Private.Winforms - 4.8.0-preview8.19361.1 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19360.9 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27910-13 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03dc91f7c42..74cca2524d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 2e4604a25c9fcbb18e0d844fc139b2756d723a31 + 9d38f318c7924ae26694c89176c3b10ec9587cd9 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 - + https://github.com/dotnet/core-setup - d6f8dd9f1f304a28faf3a4f064fee0e45710f6b8 + 00bc73b1c98defffadf097ec0c99a456291ea6db https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int ae34b415d3e316af02bd0a3898a04dd19a7a4c9d - + https://github.com/dotnet/corefx - 1247fa7a193e52bc89bc49c4ba6e44739df2dcee + 6005a1ed7772772e211a962141cb17dfc4e26539 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index a0538e7f321..1dd44ded4c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.9 - 4.8.0-preview8.19360.15 + 4.8.0-preview8.19361.1 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27910-11 - 3.0.0-preview8.19360.7 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 + 3.0.0-preview8-27910-13 + 3.0.0-preview8.19360.9 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 4.6.0-preview4.19176.11 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 - 4.6.0-preview8.19360.7 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.9 From 1387ba1860f203999fed73dcedec5e6cf78ecf49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 10:10:54 +0000 Subject: [PATCH 068/227] Update dependencies from https://github.com/dotnet/winforms build 20190711.2 (#1223) - Microsoft.Private.Winforms - 4.8.0-preview8.19361.2 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19360.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-01 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74cca2524d5..2ac9cb9f822 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 9d38f318c7924ae26694c89176c3b10ec9587cd9 + 5a8001fa361da9309f9f7d9803bbab78cd7c935f - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://github.com/dotnet/core-setup - 00bc73b1c98defffadf097ec0c99a456291ea6db + 85dba54a1c451c736ef4861d112337cdfd95b890 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int ae34b415d3e316af02bd0a3898a04dd19a7a4c9d - + https://github.com/dotnet/corefx - 6005a1ed7772772e211a962141cb17dfc4e26539 + e75dd151c9e5aa94cf33c7c9d14a53180df747dd https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 1dd44ded4c9..fedcc1f08b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.10 - 4.8.0-preview8.19361.1 + 4.8.0-preview8.19361.2 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27910-13 - 3.0.0-preview8.19360.9 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 + 3.0.0-preview8-27911-01 + 3.0.0-preview8.19360.10 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 4.6.0-preview4.19176.11 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 - 4.6.0-preview8.19360.9 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 + 4.6.0-preview8.19360.10 From f652558a9dcf5e866eca66cdc9196ff685bc3b4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 12:17:28 +0000 Subject: [PATCH 069/227] Update dependencies from https://github.com/dotnet/arcade build 20190710.8 (#1224) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19360.8 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19360.8 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19360.8 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19360.8 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19360.8 --- eng/Version.Details.xml | 20 +- eng/Versions.props | 6 +- eng/common/SigningValidation.proj | 2 +- eng/common/performance/perfhelixpublish.proj | 77 ++++++++ eng/common/performance/performance-setup.ps1 | 91 +++++++++ eng/common/performance/performance-setup.sh | 176 ++++++++++++++++++ eng/common/pipeline-logging-functions.ps1 | 7 +- .../post-build/trigger-subscriptions.ps1 | 6 +- eng/common/templates/job/performance.yml | 93 +++++++++ .../channels/internal-servicing.yml | 8 +- .../channels/public-dev-release.yml | 1 + .../post-build/channels/public-release.yml | 8 +- .../channels/public-validation-release.yml | 1 + .../templates/post-build/common-variables.yml | 3 + .../templates/steps/perf-send-to-helix.yml | 66 +++++++ eng/common/tools.ps1 | 4 +- global.json | 4 +- 17 files changed, 541 insertions(+), 32 deletions(-) create mode 100644 eng/common/performance/perfhelixpublish.proj create mode 100644 eng/common/performance/performance-setup.ps1 create mode 100644 eng/common/performance/performance-setup.sh create mode 100644 eng/common/templates/job/performance.yml create mode 100644 eng/common/templates/steps/perf-send-to-helix.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ac9cb9f822..df1fb4be9f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 85dba54a1c451c736ef4861d112337cdfd95b890 - + https://github.com/dotnet/arcade - 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f + a6ae1b637ed236354529992729af875f6c8a180a - + https://github.com/dotnet/arcade - 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f + a6ae1b637ed236354529992729af875f6c8a180a https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr ef2f9f41555c453451a5003f1be4bb9888ab078d - + https://github.com/dotnet/arcade - 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f + a6ae1b637ed236354529992729af875f6c8a180a - + https://github.com/dotnet/arcade - 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f + a6ae1b637ed236354529992729af875f6c8a180a - + https://github.com/dotnet/arcade - 0f5dd7680174620f31c9a00cdb2ac0b0e70e631f + a6ae1b637ed236354529992729af875f6c8a180a diff --git a/eng/Versions.props b/eng/Versions.props index fedcc1f08b8..fa00cbc0ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19359.6 - 1.0.0-beta.19359.6 - 1.0.0-beta.19359.6 + 1.0.0-beta.19360.8 + 1.0.0-beta.19360.8 + 1.0.0-beta.19360.8 diff --git a/eng/common/SigningValidation.proj b/eng/common/SigningValidation.proj index 7045fb6fb9d..3d0ac80af3f 100644 --- a/eng/common/SigningValidation.proj +++ b/eng/common/SigningValidation.proj @@ -3,7 +3,7 @@ + + + $(WorkItemDirectory) + $(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" + 4:00 + + + + + $(WorkItemDirectory) + $(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory)" + 4:00 + + + \ No newline at end of file diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 new file mode 100644 index 00000000000..7e5441f7974 --- /dev/null +++ b/eng/common/performance/performance-setup.ps1 @@ -0,0 +1,91 @@ +Param( + [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, + [string] $CoreRootDirectory, + [string] $Architecture="x64", + [string] $Framework="netcoreapp3.0", + [string] $CompilationMode="Tiered", + [string] $Repository=$env:BUILD_REPOSITORY_NAME, + [string] $Branch=$env:BUILD_SOURCEBRANCH, + [string] $CommitSha=$env:BUILD_SOURCEVERSION, + [string] $BuildNumber=$env:BUILD_BUILDNUMBER, + [string] $RunCategories="coreclr corefx", + [string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj", + [string] $Kind="micro", + [switch] $Internal, + [string] $Configurations="CompilationMode=$CompilationMode" +) + +$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") +$UseCoreRun = ($CoreRootDirectory -ne [string]::Empty) + +$PayloadDirectory = (Join-Path $SourceDirectory "Payload") +$PerformanceDirectory = (Join-Path $PayloadDirectory "performance") +$WorkItemDirectory = (Join-Path $SourceDirectory "workitem") +$ExtraBenchmarkDotNetArguments = "--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true" +$Creator = $env:BUILD_DEFINITIONNAME +$PerfLabArguments = "" +$HelixSourcePrefix = "pr" + +$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open" + +if ($Framework.StartsWith("netcoreapp")) { + $Queue = "Windows.10.Amd64.ClientRS4.Open" +} + +if ($Internal) { + $Queue = "Windows.10.Amd64.ClientRS5.Perf" + $PerfLabArguments = "--upload-to-perflab-container" + $ExtraBenchmarkDotNetArguments = "" + $Creator = "" + $HelixSourcePrefix = "official" +} + +$CommonSetupArguments="--frameworks $Framework --queue $Queue --build-number $BuildNumber --build-configs $Configurations" +$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments" + +if ($RunFromPerformanceRepo) { + $SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments" + + robocopy $SourceDirectory $PerformanceDirectory /E /XD $PayloadDirectory $SourceDirectory\artifacts $SourceDirectory\.git +} +else { + git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $PerformanceDirectory +} + +if ($UseCoreRun) { + $NewCoreRoot = (Join-Path $PayloadDirectory "Core_Root") + Move-Item -Path $CoreRootDirectory -Destination $NewCoreRoot +} + +$DocsDir = (Join-Path $PerformanceDirectory "docs") +robocopy $DocsDir $WorkItemDirectory + +# Set variables that we will need to have in future steps +$ci = $true + +. "$PSScriptRoot\..\pipeline-logging-functions.ps1" + +# Directories +Write-PipelineSetVariable -Name 'PayloadDirectory' -Value "$PayloadDirectory" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'PerformanceDirectory' -Value "$PerformanceDirectory" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'WorkItemDirectory' -Value "$WorkItemDirectory" -IsMultiJobVariable $false + +# Script Arguments +Write-PipelineSetVariable -Name 'Python' -Value "py -3" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'ExtraBenchmarkDotNetArguments' -Value "$ExtraBenchmarkDotNetArguments" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'SetupArguments' -Value "$SetupArguments" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'PerfLabArguments' -Value "$PerfLabArguments" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'BDNCategories' -Value "$RunCategories" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'TargetCsproj' -Value "$Csproj" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'Kind' -Value "$Kind" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'Architecture' -Value "$Architecture" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'UseCoreRun' -Value "$UseCoreRun" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'RunFromPerfRepo' -Value "$RunFromPerformanceRepo" -IsMultiJobVariable $false + +# Helix Arguments +Write-PipelineSetVariable -Name 'Creator' -Value "$Creator" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false + +exit 0 \ No newline at end of file diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh new file mode 100644 index 00000000000..126da5f76d4 --- /dev/null +++ b/eng/common/performance/performance-setup.sh @@ -0,0 +1,176 @@ +#!/usr/bin/env bash + +source_directory=$BUILD_SOURCESDIRECTORY +core_root_directory= +architecture=x64 +framework=netcoreapp3.0 +compilation_mode=tiered +repository=$BUILD_REPOSITORY_NAME +branch=$BUILD_SOURCEBRANCH +commit_sha=$BUILD_SOURCEVERSION +build_number=$BUILD_BUILDNUMBER +internal=false +kind="micro" +run_categories="coreclr corefx" +csproj="src\benchmarks\micro\MicroBenchmarks.csproj" +configurations= +run_from_perf_repo=false +use_core_run=true + +while (($# > 0)); do + lowerI="$(echo $1 | awk '{print tolower($0)}')" + case $lowerI in + --sourcedirectory) + source_directory=$2 + shift 2 + ;; + --corerootdirectory) + core_root_directory=$2 + shift 2 + ;; + --architecture) + architecture=$2 + shift 2 + ;; + --framework) + framework=$2 + shift 2 + ;; + --compilationmode) + compilation_mode=$2 + shift 2 + ;; + --repository) + repository=$2 + shift 2 + ;; + --branch) + branch=$2 + shift 2 + ;; + --commitsha) + commit_sha=$2 + shift 2 + ;; + --buildnumber) + build_number=$2 + shift 2 + ;; + --kind) + kind=$2 + shift 2 + ;; + --runcategories) + run_categories=$2 + shift 2 + ;; + --csproj) + csproj=$2 + shift 2 + ;; + --internal) + internal=true + shift 1 + ;; + --configurations) + configurations=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --corerootdirectory Directory where Core_Root exists, if running perf testing with --corerun" + echo " --architecture Architecture of the testing being run" + echo " --configurations List of key=value pairs that will be passed to perf testing infrastructure." + echo " ex: --configurations \"CompilationMode=Tiered OptimzationLevel=PGO\"" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --framework The framework to run, if not running in master" + echo " --compliationmode The compilation mode if not passing --configurations" + echo " --sourcedirectory The directory of the sources. Defaults to env:BUILD_SOURCESDIRECTORY" + echo " --repository The name of the repository in the / format. Defaults to env:BUILD_REPOSITORY_NAME" + echo " --branch The name of the branch. Defaults to env:BUILD_SOURCEBRANCH" + echo " --commitsha The commit sha1 to run against. Defaults to env:BUILD_SOURCEVERSION" + echo " --buildnumber The build number currently running. Defaults to env:BUILD_BUILDNUMBER" + echo " --csproj The relative path to the benchmark csproj whose tests should be run. Defaults to src\benchmarks\micro\MicroBenchmarks.csproj" + echo " --kind Related to csproj. The kind of benchmarks that should be run. Defaults to micro" + echo " --runcategories Related to csproj. Categories of benchmarks to run. Defaults to \"coreclr corefx\"" + echo " --internal If the benchmarks are running as an official job." + echo "" + exit 0 + ;; + esac +done + +if [[ "$repository" == "dotnet/performance" ]]; then + run_from_perf_repo=true +fi + +if [ -z "$configurations" ]; then + configurations="CompliationMode=$compilation_mode" +fi + +if [ -z "$core_root_directory" ]; then + use_core_run=false +fi + +payload_directory=$source_directory/Payload +performance_directory=$payload_directory/performance +workitem_directory=$source_directory/workitem +extra_benchmark_dotnet_arguments="--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true" +perflab_arguments= +queue=Ubuntu.1804.Amd64.Open +creator=$BUILD_DEFINITIONNAME +helix_source_prefix="pr" + +if [[ "$internal" == true ]]; then + perflab_arguments="--upload-to-perflab-container" + helix_source_prefix="official" + creator= + extra_benchmark_dotnet_arguments= + + if [[ "$architecture" = "arm64" ]]; then + queue=Ubuntu.1804.Arm64.Perf + else + queue=Ubuntu.1804.Amd64.Perf + fi +fi + +common_setup_arguments="--frameworks $framework --queue $queue --build-number $build_number --build-configs $configurations" +setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments" + +if [[ "$run_from_perf_repo" = true ]]; then + payload_directory= + workitem_directory=$source_directory + performance_directory=$workitem_directory + setup_arguments="--perf-hash $commit_sha $common_setup_arguments" +else + git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $performance_directory + + docs_directory=$performance_directory/docs + mv $docs_directory $workitem_directory +fi + +if [[ "$use_core_run" = true ]]; then + new_core_root=$payload_directory/Core_Root + mv $core_root_directory $new_core_root +fi + +# Make sure all of our variables are available for future steps +echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run" +echo "##vso[task.setvariable variable=Architecture]$architecture" +echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory" +echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory" +echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory" +echo "##vso[task.setvariable variable=Queue]$queue" +echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments" +echo "##vso[task.setvariable variable=Python]python3" +echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments" +echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments" +echo "##vso[task.setvariable variable=BDNCategories]$run_categories" +echo "##vso[task.setvariable variable=TargetCsproj]$csproj" +echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo" +echo "##vso[task.setvariable variable=Creator]$creator" +echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix" +echo "##vso[task.setvariable variable=Kind]$kind" +echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework" \ No newline at end of file diff --git a/eng/common/pipeline-logging-functions.ps1 b/eng/common/pipeline-logging-functions.ps1 index 7b61376f8aa..af5f48aaceb 100644 --- a/eng/common/pipeline-logging-functions.ps1 +++ b/eng/common/pipeline-logging-functions.ps1 @@ -77,13 +77,14 @@ function Write-PipelineTaskError { [string]$Name, [string]$Value, [switch]$Secret, - [switch]$AsOutput) - + [switch]$AsOutput, + [bool]$IsMultiJobVariable=$true) + if($ci) { Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{ 'variable' = $Name 'isSecret' = $Secret - 'isOutput' = 'true' + 'isOutput' = $IsMultiJobVariable } -AsOutput:$AsOutput } } diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index db8a839457a..1a91dab0371 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -19,14 +19,14 @@ function Get-Headers([string]$accept, [string]$barToken) { } # Get all the $SourceRepo subscriptions -$normalizedSurceRepo = $SourceRepo.Replace('dnceng@', '') -$getSubscriptionsApiEndpoint = "$maestroEndpoint/api/subscriptions?sourceRepository=$normalizedSurceRepo&api-version=$apiVersion" +$normalizedSourceRepo = $SourceRepo.Replace('dnceng@', '') +$getSubscriptionsApiEndpoint = "$maestroEndpoint/api/subscriptions?sourceRepository=$normalizedSourceRepo&api-version=$apiVersion" $headers = Get-Headers 'application/json' $barToken $subscriptions = Invoke-WebRequest -Uri $getSubscriptionsApiEndpoint -Headers $headers | ConvertFrom-Json if (!$subscriptions) { - Write-Host "No subscriptions found for source repo '$normalizedSurceRepo' in channel '$ChannelId'" + Write-Host "No subscriptions found for source repo '$normalizedSourceRepo' in channel '$ChannelId'" return } diff --git a/eng/common/templates/job/performance.yml b/eng/common/templates/job/performance.yml new file mode 100644 index 00000000000..ef809253d1a --- /dev/null +++ b/eng/common/templates/job/performance.yml @@ -0,0 +1,93 @@ +parameters: + steps: [] # optional -- any additional steps that need to happen before pulling down the performance repo and sending the performance benchmarks to helix (ie building your repo) + variables: [] # optional -- list of additional variables to send to the template + jobName: '' # required -- job name + displayName: '' # optional -- display name for the job. Will use jobName if not passed + pool: '' # required -- name of the Build pool + container: '' # required -- name of the container + extraSetupParameters: '' # optional -- extra arguments to pass to the setup script + frameworks: ['netcoreapp3.0'] # optional -- list of frameworks to run against + continueOnError: 'false' # optional -- determines whether to continue the build if the step errors + dependsOn: '' # optional -- dependencies of the job + timeoutInMinutes: 320 # optional -- timeout for the job + enableTelemetry: false # optional -- enable for telemetry + +jobs: +- template: ../jobs/jobs.yml + parameters: + dependsOn: ${{ parameters.dependsOn }} + enableTelemetry: ${{ parameters.enableTelemetry }} + enablePublishBuildArtifacts: true + continueOnError: ${{ parameters.continueOnError }} + + jobs: + - job: '${{ parameters.jobName }}' + + ${{ if ne(parameters.displayName, '') }}: + displayName: '${{ parameters.displayName }}' + ${{ if eq(parameters.displayName, '') }}: + displayName: '${{ parameters.jobName }}' + + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + variables: + + - ${{ each variable in parameters.variables }}: + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + - IsInternal: '' + - HelixApiAccessToken: '' + - HelixPreCommand: '' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(variables['Agent.Os'], 'Windows_NT') }}: + - HelixPreCommand: 'set "PERFLAB_UPLOAD_TOKEN=$(PerfCommandUploadToken)"' + - IsInternal: -Internal + - ${{ if ne(variables['Agent.Os'], 'Windows_NT') }}: + - HelixPreCommand: 'export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"' + - IsInternal: --internal + - group: DotNet-HelixApi-Access + - group: dotnet-benchview + + workspace: + clean: all + pool: + ${{ parameters.pool }} + container: ${{ parameters.container }} + strategy: + matrix: + ${{ each framework in parameters.frameworks }}: + ${{ framework }}: + _Framework: ${{ framework }} + steps: + - checkout: self + clean: true + # Run all of the steps to setup repo + - ${{ each step in parameters.steps }}: + - ${{ step }} + - powershell: $(Build.SourcesDirectory)\eng\common\performance\performance-setup.ps1 $(IsInternal) -Framework $(_Framework) ${{ parameters.extraSetupParameters }} + displayName: Performance Setup (Windows) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $(Build.SourcesDirectory)/eng/common/performance/performance-setup.sh $(IsInternal) --framework $(_Framework) ${{ parameters.extraSetupParameters }} + displayName: Performance Setup (Unix) + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $(Python) $(PerformanceDirectory)/scripts/ci_setup.py $(SetupArguments) + displayName: Run ci setup script + # Run perf testing in helix + - template: /eng/common/templates/steps/perf-send-to-helix.yml + parameters: + HelixSource: '$(HelixSourcePrefix)/$(Build.Repository.Name)/$(Build.SourceBranch)' # sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'test/performance/$(Kind)/$(_Framework)/$(Architecture)' + HelixAccessToken: $(HelixApiAccessToken) + HelixTargetQueues: $(Queue) + HelixPreCommands: $(HelixPreCommand) + Creator: $(Creator) + WorkItemTimeout: 4:00 # 4 hours + WorkItemDirectory: '$(WorkItemDirectory)' # WorkItemDirectory can not be empty, so we send it some docs to keep it happy + CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml index 808d46b17f2..50ad724fc0c 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -81,10 +81,10 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) + /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) + /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) + /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' /p:BuildAssetRegistryToken='$(MaestroAccessToken)' @@ -167,4 +167,4 @@ stages: - template: ../promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} \ No newline at end of file + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index 79c6822db72..bdc631016b6 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -77,6 +77,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ChannelId=$(PublicDevRelease_30_Channel_Id) + /p:ArtifactsCategory=.NetCore /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml index 25923020df8..574cb1c2b92 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -81,10 +81,10 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(Agent.BuildDirectory)/Nuget/NuGet.exe - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) + /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) + /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' /p:BuildAssetRegistryToken='$(MaestroAccessToken)' diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 114477d3adb..f12f402ad9a 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -48,6 +48,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) + /p:ArtifactsCategory=.NetCoreValidation /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 82834673520..42df4ae77e3 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -14,5 +14,8 @@ variables: # Whether the build is internal or not IsInternalBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + # Storage account name for proxy-backed feeds + ProxyBackedFeedsAccountName: dotnetfeed + SourceLinkCLIVersion: 3.0.0 SymbolToolVersion: 1.0.1 diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml new file mode 100644 index 00000000000..b3ea9acf1f1 --- /dev/null +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -0,0 +1,66 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json + EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Send job to Helix' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 $(Build.SourcesDirectory)\eng\common\performance\perfhelixpublish.proj /restore /t:Test /bl:$(Build.SourcesDirectory)\artifacts\log\$env:BuildConfig\SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/performance/perfhelixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 60741f03901..9abaac015fb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -84,7 +84,7 @@ function Exec-Process([string]$command, [string]$commandArgs) { return $global:LASTEXITCODE = $process.ExitCode } finally { - # If we didn't finish then an error occured or the user hit ctrl-c. Either + # If we didn't finish then an error occurred or the user hit ctrl-c. Either # way kill the process if (-not $finished) { $process.Kill() @@ -147,7 +147,7 @@ function InitializeDotNetCli([bool]$install) { # It also ensures that VS msbuild will use the downloaded sdk targets. $env:PATH = "$dotnetRoot;$env:PATH" - # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build + # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' diff --git a/global.json b/global.json index 4b7be474abb..65bec3d240c 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.6", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19359.6" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19360.8", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19360.8" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From d25ea3f8e8cce3162dbdc9ef9793bc60becf97a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 13:06:45 +0000 Subject: [PATCH 070/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190710.2 (#1225) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19360.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df1fb4be9f6..ac077a67f1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx e75dd151c9e5aa94cf33c7c9d14a53180df747dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - ae34b415d3e316af02bd0a3898a04dd19a7a4c9d + 6575b56e7e9dfd8ab5c8ebddc0bc4011789c8f03 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index fa00cbc0ae8..7aeca88bb54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19359.6 + 4.8.0-preview8.19360.2 From 6a8906921a4fc4ed7ecd394898eca3bf7503e49d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 17:35:55 +0000 Subject: [PATCH 071/227] Update dependencies from https://github.com/dotnet/winforms build 20190711.4 (#1226) - Microsoft.Private.Winforms - 4.8.0-preview8.19361.4 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19361.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-03 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac077a67f1a..b87bfb5ba66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 5a8001fa361da9309f9f7d9803bbab78cd7c935f + c96177d5b6d63882aa1112c18f0a66bf3c76b356 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/core-setup - 85dba54a1c451c736ef4861d112337cdfd95b890 + 3ca720b8a2dc8f711a4762729d5c6a223ecc523a https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade a6ae1b637ed236354529992729af875f6c8a180a - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6575b56e7e9dfd8ab5c8ebddc0bc4011789c8f03 - + https://github.com/dotnet/corefx - e75dd151c9e5aa94cf33c7c9d14a53180df747dd + a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 7aeca88bb54..27ffb6f73ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19360.10 + 4.6.0-preview8.19361.1 - 4.8.0-preview8.19361.2 + 4.8.0-preview8.19361.4 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27911-01 - 3.0.0-preview8.19360.10 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 + 3.0.0-preview8-27911-03 + 3.0.0-preview8.19361.1 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 4.6.0-preview4.19176.11 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 - 4.6.0-preview8.19360.10 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.1 From e453d8b51490ed3be7c4f412d820baa74e08d1e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 18:20:56 +0000 Subject: [PATCH 072/227] Update dependencies from https://github.com/dotnet/winforms build 20190711.5 (#1227) - Microsoft.Private.Winforms - 4.8.0-preview8.19361.5 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-04 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b87bfb5ba66..8c59896ff3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - c96177d5b6d63882aa1112c18f0a66bf3c76b356 + 9225a96892400bd331d0b699a932d19c473b522d @@ -59,7 +59,7 @@ https://github.com/dotnet/corefx a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 - + https://github.com/dotnet/core-setup 3ca720b8a2dc8f711a4762729d5c6a223ecc523a diff --git a/eng/Versions.props b/eng/Versions.props index 27ffb6f73ed..34a79432e0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19361.4 + 4.8.0-preview8.19361.5 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27911-03 + 3.0.0-preview8-27911-04 3.0.0-preview8.19361.1 4.6.0-preview8.19361.1 4.6.0-preview8.19361.1 From 63b6ed32acc83a8f4c79b3ddcc24797e3ae106da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 21:25:54 +0000 Subject: [PATCH 073/227] Update dependencies from https://github.com/dotnet/winforms build 20190711.6 (#1229) - Microsoft.Private.Winforms - 4.8.0-preview8.19361.6 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19361.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-06 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c59896ff3c..6a4fc16cdcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 9225a96892400bd331d0b699a932d19c473b522d + 0c8451cc753c4ac33f710ef346e75a92bb604368 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 - + https://github.com/dotnet/core-setup - 3ca720b8a2dc8f711a4762729d5c6a223ecc523a + b50ae399995d55d43504d7bdfc54dd0274b326d4 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade a6ae1b637ed236354529992729af875f6c8a180a - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6575b56e7e9dfd8ab5c8ebddc0bc4011789c8f03 - + https://github.com/dotnet/corefx - a393ffee970c6d962c5830bb1c6fa4c3a3e268a6 + 616fb95ed04bf8939c29958011e2de0444329819 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 34a79432e0c..a1f1dbde3af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.4 - 4.8.0-preview8.19361.5 + 4.8.0-preview8.19361.6 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27911-04 - 3.0.0-preview8.19361.1 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 + 3.0.0-preview8-27911-06 + 3.0.0-preview8.19361.4 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 4.6.0-preview4.19176.11 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 - 4.6.0-preview8.19361.1 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.4 From 3725fcfe2431185fdb74d88a887e21d47770530a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 00:10:53 +0000 Subject: [PATCH 074/227] Update dependencies from https://github.com/dotnet/winforms build 20190711.7 (#1232) - Microsoft.Private.Winforms - 4.8.0-preview8.19361.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a4fc16cdcd..c6df58393de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 0c8451cc753c4ac33f710ef346e75a92bb604368 + 4178001fa518a8ede21a0616c6f92922de96084a diff --git a/eng/Versions.props b/eng/Versions.props index a1f1dbde3af..9e1586441eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19361.6 + 4.8.0-preview8.19361.7 From c7d5321237d39dd71114bad8639c21977932bdbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 05:28:03 +0000 Subject: [PATCH 075/227] Update dependencies from https://github.com/dotnet/winforms build 20190711.8 (#1233) - Microsoft.Private.Winforms - 4.8.0-preview8.19361.8 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19361.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19361.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19361.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19361.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19361.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-12 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6df58393de..d2f94b62a7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 4178001fa518a8ede21a0616c6f92922de96084a + 28487ada5b854dd19dc6cc249297a1e348145e05 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/core-setup - b50ae399995d55d43504d7bdfc54dd0274b326d4 + fa95a7b33e27183d88504b11b736d2738c923ae7 https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade a6ae1b637ed236354529992729af875f6c8a180a - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6575b56e7e9dfd8ab5c8ebddc0bc4011789c8f03 - + https://github.com/dotnet/corefx - 616fb95ed04bf8939c29958011e2de0444329819 + 787b7cd8a70f8d9cb3b4791524934b77e673ae86 - + https://github.com/dotnet/coreclr - ef2f9f41555c453451a5003f1be4bb9888ab078d + 140e74c7a350a1dfab3d5cd13d13f430265f7446 - + https://github.com/dotnet/coreclr - ef2f9f41555c453451a5003f1be4bb9888ab078d + 140e74c7a350a1dfab3d5cd13d13f430265f7446 - + https://github.com/dotnet/coreclr - ef2f9f41555c453451a5003f1be4bb9888ab078d + 140e74c7a350a1dfab3d5cd13d13f430265f7446 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 9e1586441eb..cd6597c3f17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.10 - 4.8.0-preview8.19361.7 + 4.8.0-preview8.19361.8 - 3.0.0-preview8.19360.2 - 3.0.0-preview8.19360.2 - 3.0.0-preview8.19360.2 + 3.0.0-preview8.19361.2 + 3.0.0-preview8.19361.2 + 3.0.0-preview8.19361.2 - 3.0.0-preview8-27911-06 - 3.0.0-preview8.19361.4 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 + 3.0.0-preview8-27911-12 + 3.0.0-preview8.19361.10 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 4.6.0-preview4.19176.11 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 - 4.6.0-preview8.19361.4 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.10 From 0bd9e54777e19a51c7d00dabc16dda6715cd7290 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 09:10:52 +0000 Subject: [PATCH 076/227] [master] Update dependencies from dotnet/winforms (#1234) * Update dependencies from https://github.com/dotnet/winforms build 20190712.1 - Microsoft.Private.Winforms - 4.8.0-preview8.19362.1 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19361.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-13 (parent: Microsoft.Private.Winforms) * Update dependencies from https://github.com/dotnet/winforms build 20190712.2 - Microsoft.Private.Winforms - 4.8.0-preview8.19362.2 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19361.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27911-14 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2f94b62a7b..769dafc36bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 28487ada5b854dd19dc6cc249297a1e348145e05 + 1dda2dae3194f1591015c3f53e6488fd9a6c63dc - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://github.com/dotnet/core-setup - fa95a7b33e27183d88504b11b736d2738c923ae7 + e7e7d11ca84fbc32b7ab149fda648030c30b5f9d https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade a6ae1b637ed236354529992729af875f6c8a180a - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6575b56e7e9dfd8ab5c8ebddc0bc4011789c8f03 - + https://github.com/dotnet/corefx - 787b7cd8a70f8d9cb3b4791524934b77e673ae86 + 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index cd6597c3f17..c76955ea0a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.12 - 4.8.0-preview8.19361.8 + 4.8.0-preview8.19362.2 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27911-12 - 3.0.0-preview8.19361.10 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 + 3.0.0-preview8-27911-14 + 3.0.0-preview8.19361.12 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 4.6.0-preview4.19176.11 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 - 4.6.0-preview8.19361.10 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.12 From c8aad733bc9b0dfc651c3a6ced5f547252379254 Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 12 Jul 2019 19:24:50 +1000 Subject: [PATCH 077/227] Reuse MSBuild's ContinueOnError property I'm looking to make the same change in https://github.com/dotnet/sdk/pull/3399 and am blocked by the fact that `Microsoft.NET.Sdk.WindowsDesktop.targets` still uses the property defined there. This property is defaulted to `false` by MSBuild in https://github.com/microsoft/msbuild/blob/0cd0e92a7243088977d31b56626b56d6116de016/src/Tasks/Microsoft.Common.CurrentVersion.targets#L608 In a design time build it will have a value of `ContinueOnError`. This is the same behaviour as for `CheckForDuplicateItemsContinueOnError`, just without the redundant duplicate property. --- .../targets/Microsoft.NET.Sdk.WindowsDesktop.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets index 8beb86feab2..69b72c766d3 100644 --- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets +++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets @@ -25,7 +25,7 @@ DefaultItemsOfThisTypeEnabled="$(EnableDefaultPageItems)" PropertyNameToDisableDefaultItems="EnableDefaultPageItems" MoreInformationLink="$(DefaultItemsMoreInformationLink)" - ContinueOnError="$(CheckForDuplicateItemsContinueOnError)"> + ContinueOnError="$(ContinueOnError)"> From 7b73eb5a98285a2aa1013475259e4d07086e4e11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 12:16:52 +0000 Subject: [PATCH 078/227] Update dependencies from https://github.com/dotnet/arcade build 20190711.7 (#1237) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19361.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19361.7 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19361.7 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19361.7 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19361.7 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 769dafc36bb..cf4f8f827b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup e7e7d11ca84fbc32b7ab149fda648030c30b5f9d - + https://github.com/dotnet/arcade - a6ae1b637ed236354529992729af875f6c8a180a + f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/arcade - a6ae1b637ed236354529992729af875f6c8a180a + f1b09644408f45f43f5835786b3e4bdfd2e78141 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 140e74c7a350a1dfab3d5cd13d13f430265f7446 - + https://github.com/dotnet/arcade - a6ae1b637ed236354529992729af875f6c8a180a + f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/arcade - a6ae1b637ed236354529992729af875f6c8a180a + f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/arcade - a6ae1b637ed236354529992729af875f6c8a180a + f1b09644408f45f43f5835786b3e4bdfd2e78141 diff --git a/eng/Versions.props b/eng/Versions.props index c76955ea0a0..80884db497a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19360.8 - 1.0.0-beta.19360.8 - 1.0.0-beta.19360.8 + 1.0.0-beta.19361.7 + 1.0.0-beta.19361.7 + 1.0.0-beta.19361.7 diff --git a/global.json b/global.json index 65bec3d240c..14bf74e6945 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19360.8", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19360.8" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19361.7", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19361.7" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 21720eff880dfd14ff34f33494f8f4b62002cc00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 13:01:57 +0000 Subject: [PATCH 079/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190711.2 (#1240) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19361.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf4f8f827b3..d4772d4587f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 6575b56e7e9dfd8ab5c8ebddc0bc4011789c8f03 + 6ed3985b2659a81ab755c93b27ac32780e8d145c https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 80884db497a..d4d1c5f938d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19360.2 + 4.8.0-preview8.19361.2 From bbd21192f8d7caf41930aa79c7f7bffbc3b649d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 17:15:19 +0000 Subject: [PATCH 080/227] Update dependencies from https://github.com/dotnet/winforms build 20190712.5 (#1242) - Microsoft.Private.Winforms - 4.8.0-preview8.19362.5 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19361.13 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19362.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19362.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19362.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19362.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-04 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++++----------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4772d4587f..f4addb4debf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 1dda2dae3194f1591015c3f53e6488fd9a6c63dc + 7390ea96fe8ed63ce4a1353f3ddc359f6203658e - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/core-setup - e7e7d11ca84fbc32b7ab149fda648030c30b5f9d + ca870065b77a47c1106fafa4788c215651d6e31d https://github.com/dotnet/arcade @@ -71,27 +71,27 @@ https://github.com/dotnet/arcade f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ed3985b2659a81ab755c93b27ac32780e8d145c - + https://github.com/dotnet/corefx - 9d6d6b7fe0cf4c28ed64b35627ff7024077139a4 + e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/coreclr 140e74c7a350a1dfab3d5cd13d13f430265f7446 - + https://github.com/dotnet/coreclr 140e74c7a350a1dfab3d5cd13d13f430265f7446 - + https://github.com/dotnet/coreclr 140e74c7a350a1dfab3d5cd13d13f430265f7446 diff --git a/eng/Versions.props b/eng/Versions.props index d4d1c5f938d..49271ce766c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.13 - 4.8.0-preview8.19362.2 + 4.8.0-preview8.19362.5 - 3.0.0-preview8.19361.2 - 3.0.0-preview8.19361.2 - 3.0.0-preview8.19361.2 + 3.0.0-preview8.19362.1 + 3.0.0-preview8.19362.1 + 3.0.0-preview8.19362.1 - 3.0.0-preview8-27911-14 - 3.0.0-preview8.19361.12 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 + 3.0.0-preview8-27912-04 + 3.0.0-preview8.19361.13 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 4.6.0-preview4.19176.11 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 - 4.6.0-preview8.19361.12 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 + 4.6.0-preview8.19361.13 From 04a02cc1d09b8f50ace7a28c7a267f42adc7f6a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 17:36:12 +0000 Subject: [PATCH 081/227] Update dependencies from https://github.com/dotnet/winforms build 20190712.4 (#1243) - Microsoft.Private.Winforms - 4.8.0-preview8.19362.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-03 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4addb4debf..923f56be832 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 7390ea96fe8ed63ce4a1353f3ddc359f6203658e + f0907ad904268482d1463f610786fad9a236e62e @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 - + https://github.com/dotnet/core-setup - ca870065b77a47c1106fafa4788c215651d6e31d + 24699092bfcfc2a5f13e6b9f5a4046fdd45ca047 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 49271ce766c..1def43293a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19362.5 + 4.8.0-preview8.19362.4 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27912-04 + 3.0.0-preview8-27912-03 3.0.0-preview8.19361.13 4.6.0-preview8.19361.13 4.6.0-preview8.19361.13 From b9bba078b88748df02e56f995278216d3effeb70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 20:55:52 +0000 Subject: [PATCH 082/227] Update dependencies from https://github.com/dotnet/winforms build 20190712.7 (#1244) - Microsoft.Private.Winforms - 4.8.0-preview8.19362.7 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19362.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-06 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 923f56be832..e82e1ef1bab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - f0907ad904268482d1463f610786fad9a236e62e + 5c0b240f31f438cbce461938a4edb01f5f14ce2e - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 - + https://github.com/dotnet/core-setup - 24699092bfcfc2a5f13e6b9f5a4046fdd45ca047 + a812fed3dcd0f57721bfc0ffedfa56006be0cc0f https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ed3985b2659a81ab755c93b27ac32780e8d145c - + https://github.com/dotnet/corefx - e519628accc31bd3d5f0a3bc5f937a2ec1dd55d1 + b9cc38a5eb57906960a911f6e816776434a9bdb4 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 1def43293a8..d24951b7b8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19361.13 + 4.6.0-preview8.19362.2 - 4.8.0-preview8.19362.4 + 4.8.0-preview8.19362.7 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27912-03 - 3.0.0-preview8.19361.13 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 + 3.0.0-preview8-27912-06 + 3.0.0-preview8.19362.2 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 4.6.0-preview4.19176.11 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 - 4.6.0-preview8.19361.13 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.2 From f3af73fe7573a92d24cd2d4128320cffea4ce409 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 23:05:52 +0000 Subject: [PATCH 083/227] Update dependencies from https://github.com/dotnet/winforms build 20190712.8 (#1245) - Microsoft.Private.Winforms - 4.8.0-preview8.19362.8 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19362.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e82e1ef1bab..141639e1070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 5c0b240f31f438cbce461938a4edb01f5f14ce2e + 8e46b42cbf0ba09eabf5d354d61ab9b5b851f71b - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 - + https://github.com/dotnet/core-setup - a812fed3dcd0f57721bfc0ffedfa56006be0cc0f + 5cddea518db0685f58e6a5a07705ac1e45513ee8 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ed3985b2659a81ab755c93b27ac32780e8d145c - + https://github.com/dotnet/corefx - b9cc38a5eb57906960a911f6e816776434a9bdb4 + 4ddf96fe04a6befe8814651a9933258379e3f4f4 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index d24951b7b8a..0ca57c6e439 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.3 - 4.8.0-preview8.19362.7 + 4.8.0-preview8.19362.8 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27912-06 - 3.0.0-preview8.19362.2 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 + 3.0.0-preview8-27912-07 + 3.0.0-preview8.19362.3 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 4.6.0-preview4.19176.11 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 - 4.6.0-preview8.19362.2 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.3 From c530a191856541c9727b02c596f83c2fd439ea18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 03:15:48 +0000 Subject: [PATCH 084/227] Update dependencies from https://github.com/dotnet/winforms build 20190712.9 (#1246) - Microsoft.Private.Winforms - 4.8.0-preview8.19362.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 141639e1070..c912ae8f92c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 8e46b42cbf0ba09eabf5d354d61ab9b5b851f71b + b35f88af9377224e0a3f2e51c28111ca4c90313a diff --git a/eng/Versions.props b/eng/Versions.props index 0ca57c6e439..6ce856ed0c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19362.8 + 4.8.0-preview8.19362.9 From 1215d21b075314d1fce41bccaa3e1bb9326c83f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 04:00:47 +0000 Subject: [PATCH 085/227] Update dependencies from https://github.com/dotnet/winforms build 20190712.10 (#1247) - Microsoft.Private.Winforms - 4.8.0-preview8.19362.10 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19362.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-11 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c912ae8f92c..6eace341118 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - b35f88af9377224e0a3f2e51c28111ca4c90313a + 30f7bc67c63db05c5430f4f06838ed5be2676d1f - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 - + https://github.com/dotnet/core-setup - 5cddea518db0685f58e6a5a07705ac1e45513ee8 + b39e86b2a0d91c02cdf9387cbe24ee265c4b36b7 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ed3985b2659a81ab755c93b27ac32780e8d145c - + https://github.com/dotnet/corefx - 4ddf96fe04a6befe8814651a9933258379e3f4f4 + 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 6ce856ed0c1..a6974aa35b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.7 - 4.8.0-preview8.19362.9 + 4.8.0-preview8.19362.10 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27912-07 - 3.0.0-preview8.19362.3 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 + 3.0.0-preview8-27912-11 + 3.0.0-preview8.19362.7 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 4.6.0-preview4.19176.11 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 - 4.6.0-preview8.19362.3 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.7 From 140eb56157b1340842283bbd687c032103b8cdb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 05:15:53 +0000 Subject: [PATCH 086/227] Update dependencies from https://github.com/dotnet/winforms build 20190712.12 (#1248) - Microsoft.Private.Winforms - 4.8.0-preview8.19362.12 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19362.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-13 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eace341118..17d2782413d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 30f7bc67c63db05c5430f4f06838ed5be2676d1f + 4c7c6a278e9c578403726c0027161fb41017b972 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/core-setup - b39e86b2a0d91c02cdf9387cbe24ee265c4b36b7 + b5983343c7ff2946a3ba769c42d025bb731c65b7 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ed3985b2659a81ab755c93b27ac32780e8d145c - + https://github.com/dotnet/corefx - 23f6feb8abf3e6b7ba37eba1731a30e0eb7fcb96 + 635b268f77eadeb469d2b14cfbf655f035898f13 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index a6974aa35b3..b2f8aa42d5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.8 - 4.8.0-preview8.19362.10 + 4.8.0-preview8.19362.12 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27912-11 - 3.0.0-preview8.19362.7 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 + 3.0.0-preview8-27912-13 + 3.0.0-preview8.19362.8 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 4.6.0-preview4.19176.11 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 - 4.6.0-preview8.19362.7 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.8 From af7570f8216e78a159921d6cf76b4c4d654ec4c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 05:45:50 +0000 Subject: [PATCH 087/227] Update dependencies from https://github.com/dotnet/winforms build 20190712.11 (#1249) - Microsoft.Private.Winforms - 4.8.0-preview8.19362.11 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-12 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17d2782413d..f09c0ef5afa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 4c7c6a278e9c578403726c0027161fb41017b972 + 15725abcdc3311b329b00da96a29666915c75f74 @@ -59,7 +59,7 @@ https://github.com/dotnet/corefx 635b268f77eadeb469d2b14cfbf655f035898f13 - + https://github.com/dotnet/core-setup b5983343c7ff2946a3ba769c42d025bb731c65b7 diff --git a/eng/Versions.props b/eng/Versions.props index b2f8aa42d5a..a7cb719042b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19362.12 + 4.8.0-preview8.19362.11 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27912-13 + 3.0.0-preview8-27912-12 3.0.0-preview8.19362.8 4.6.0-preview8.19362.8 4.6.0-preview8.19362.8 From 976c9165c99a58b26e6363096dd64ffdfe5665e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 10:45:52 +0000 Subject: [PATCH 088/227] Update dependencies from https://github.com/dotnet/winforms build 20190713.1 (#1250) - Microsoft.Private.Winforms - 4.8.0-preview8.19363.1 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19362.11 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27912-15 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f09c0ef5afa..d67b58c1f6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 15725abcdc3311b329b00da96a29666915c75f74 + 4401abf14f64b387130a230393cfa293a87ea23c - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/core-setup - b5983343c7ff2946a3ba769c42d025bb731c65b7 + a7d2e0d27b2a6be92b620de7c321a29fe42fca53 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade f1b09644408f45f43f5835786b3e4bdfd2e78141 - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ed3985b2659a81ab755c93b27ac32780e8d145c - + https://github.com/dotnet/corefx - 635b268f77eadeb469d2b14cfbf655f035898f13 + 1841042b99062de13dc80098cede9413be569238 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index a7cb719042b..77fb7c05041 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.11 - 4.8.0-preview8.19362.11 + 4.8.0-preview8.19363.1 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27912-12 - 3.0.0-preview8.19362.8 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 + 3.0.0-preview8-27912-15 + 3.0.0-preview8.19362.11 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 4.6.0-preview4.19176.11 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 - 4.6.0-preview8.19362.8 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 + 4.6.0-preview8.19362.11 From f95ad2a0ecd4af1779ee1f18f1e9a89d11dd0046 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 12:16:51 +0000 Subject: [PATCH 089/227] Update dependencies from https://github.com/dotnet/arcade build 20190712.5 (#1251) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19362.5 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19362.5 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19362.5 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19362.5 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19362.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d67b58c1f6e..dda0ad40ee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup a7d2e0d27b2a6be92b620de7c321a29fe42fca53 - + https://github.com/dotnet/arcade - f1b09644408f45f43f5835786b3e4bdfd2e78141 + 15f50ca6a9d0b441c9927421657fb9dc91206cc9 - + https://github.com/dotnet/arcade - f1b09644408f45f43f5835786b3e4bdfd2e78141 + 15f50ca6a9d0b441c9927421657fb9dc91206cc9 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 140e74c7a350a1dfab3d5cd13d13f430265f7446 - + https://github.com/dotnet/arcade - f1b09644408f45f43f5835786b3e4bdfd2e78141 + 15f50ca6a9d0b441c9927421657fb9dc91206cc9 - + https://github.com/dotnet/arcade - f1b09644408f45f43f5835786b3e4bdfd2e78141 + 15f50ca6a9d0b441c9927421657fb9dc91206cc9 - + https://github.com/dotnet/arcade - f1b09644408f45f43f5835786b3e4bdfd2e78141 + 15f50ca6a9d0b441c9927421657fb9dc91206cc9 diff --git a/eng/Versions.props b/eng/Versions.props index 77fb7c05041..afa6ebd6b50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19361.7 - 1.0.0-beta.19361.7 - 1.0.0-beta.19361.7 + 1.0.0-beta.19362.5 + 1.0.0-beta.19362.5 + 1.0.0-beta.19362.5 diff --git a/global.json b/global.json index 14bf74e6945..a5a5b92440a 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19361.7", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19361.7" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19362.5", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19362.5" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 89d1bddcfadbacf425fac6ba90670c7b32f139fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 13:05:53 +0000 Subject: [PATCH 090/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190712.2 (#1252) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19362.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dda0ad40ee6..0f3f4d84f78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 1841042b99062de13dc80098cede9413be569238 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 6ed3985b2659a81ab755c93b27ac32780e8d145c + 0b93d365493c4ef8e211935c3ee12ad3821e517c https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index afa6ebd6b50..a3f284e2637 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19361.2 + 4.8.0-preview8.19362.2 From c309aceeb916c88813e77e934ed5e762d9e4856c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 15:40:53 +0000 Subject: [PATCH 091/227] Update dependencies from https://github.com/dotnet/winforms build 20190713.2 (#1253) - Microsoft.Private.Winforms - 4.8.0-preview8.19363.2 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-01 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f3f4d84f78..da836722695 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 4401abf14f64b387130a230393cfa293a87ea23c + 7f1e97623ee6ecb36cc672ec2c3bb3acacff3c5c @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/core-setup - a7d2e0d27b2a6be92b620de7c321a29fe42fca53 + 451d8246080cc678eb14de2b7ab2a2da44a523e6 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index a3f284e2637..4705edd4017 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19363.1 + 4.8.0-preview8.19363.2 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27912-15 + 3.0.0-preview8-27913-01 3.0.0-preview8.19362.11 4.6.0-preview8.19362.11 4.6.0-preview8.19362.11 From 4113ce7944a305b769115dbb7f04498d993d4481 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 17:25:51 +0000 Subject: [PATCH 092/227] Update dependencies from https://github.com/dotnet/winforms build 20190713.3 (#1254) - Microsoft.Private.Winforms - 4.8.0-preview8.19363.3 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19363.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19363.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-02 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da836722695..617f2e72905 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 7f1e97623ee6ecb36cc672ec2c3bb3acacff3c5c + 2f3079707f6d27f97441c7c8e6c229ad1562cf56 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/core-setup - 451d8246080cc678eb14de2b7ab2a2da44a523e6 + 870d024bba34ef3d435e7b90f9917ce7c1ab6ac4 https://github.com/dotnet/arcade @@ -83,17 +83,17 @@ https://github.com/dotnet/corefx 1841042b99062de13dc80098cede9413be569238 - + https://github.com/dotnet/coreclr - 140e74c7a350a1dfab3d5cd13d13f430265f7446 + d1bfda7c599d9683c972856a4f26c9b59f45c675 - + https://github.com/dotnet/coreclr - 140e74c7a350a1dfab3d5cd13d13f430265f7446 + d1bfda7c599d9683c972856a4f26c9b59f45c675 - + https://github.com/dotnet/coreclr - 140e74c7a350a1dfab3d5cd13d13f430265f7446 + d1bfda7c599d9683c972856a4f26c9b59f45c675 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 4705edd4017..721ae626367 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ - 4.8.0-preview8.19363.2 + 4.8.0-preview8.19363.3 - 3.0.0-preview8.19362.1 - 3.0.0-preview8.19362.1 - 3.0.0-preview8.19362.1 + 3.0.0-preview8.19363.1 + 3.0.0-preview8.19363.1 + 3.0.0-preview8.19363.1 - 3.0.0-preview8-27913-01 + 3.0.0-preview8-27913-02 3.0.0-preview8.19362.11 4.6.0-preview8.19362.11 4.6.0-preview8.19362.11 From c9d0b1ba49ca44ac87b9658c24b8345cc1087d78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2019 20:35:53 +0000 Subject: [PATCH 093/227] Update dependencies from https://github.com/dotnet/winforms build 20190713.6 (#1255) - Microsoft.Private.Winforms - 4.8.0-preview8.19363.6 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19363.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-05 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 617f2e72905..073cc856a09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 2f3079707f6d27f97441c7c8e6c229ad1562cf56 + cba376f70a632c87afe2a235e6ffe01372c9d1f2 - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f - + https://github.com/dotnet/core-setup - 870d024bba34ef3d435e7b90f9917ce7c1ab6ac4 + 27e4f65255bc771c079542f88422649e1c5cee33 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 15f50ca6a9d0b441c9927421657fb9dc91206cc9 - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 0b93d365493c4ef8e211935c3ee12ad3821e517c - + https://github.com/dotnet/corefx - 1841042b99062de13dc80098cede9413be569238 + 087dd359a91fb8a50a750b51159d1b422931e41f https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 721ae626367..e9873887a7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19362.11 + 4.6.0-preview8.19363.1 - 4.8.0-preview8.19363.3 + 4.8.0-preview8.19363.6 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27913-02 - 3.0.0-preview8.19362.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 + 3.0.0-preview8-27913-05 + 3.0.0-preview8.19363.1 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 4.6.0-preview4.19176.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 - 4.6.0-preview8.19362.11 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.1 From 65721c95364e68b5598181a161e1960427e34417 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 02:35:49 +0000 Subject: [PATCH 094/227] Update dependencies from https://github.com/dotnet/winforms build 20190713.7 (#1256) - Microsoft.Private.Winforms - 4.8.0-preview8.19363.7 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19363.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-06 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 073cc856a09..dfdc53508ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - cba376f70a632c87afe2a235e6ffe01372c9d1f2 + f13941f575d92d01d016478e0fdb4cdd07d0c8d8 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/core-setup - 27e4f65255bc771c079542f88422649e1c5cee33 + 0613c0429e419649cc2688d314aee9b33ee8b967 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 15f50ca6a9d0b441c9927421657fb9dc91206cc9 - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 0b93d365493c4ef8e211935c3ee12ad3821e517c - + https://github.com/dotnet/corefx - 087dd359a91fb8a50a750b51159d1b422931e41f + 5294f0da4695162603d24dba351c985181042796 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index e9873887a7a..0a5a0f3a2d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.3 - 4.8.0-preview8.19363.6 + 4.8.0-preview8.19363.7 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27913-05 - 3.0.0-preview8.19363.1 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 + 3.0.0-preview8-27913-06 + 3.0.0-preview8.19363.3 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 4.6.0-preview4.19176.11 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 - 4.6.0-preview8.19363.1 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.3 From dd85b42224d8cea5151b5e2c5fe21064bb291c87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 04:35:49 +0000 Subject: [PATCH 095/227] Update dependencies from https://github.com/dotnet/winforms build 20190713.8 (#1257) - Microsoft.Private.Winforms - 4.8.0-preview8.19363.8 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19363.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19363.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19363.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19363.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfdc53508ee..6c95fb22dcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - f13941f575d92d01d016478e0fdb4cdd07d0c8d8 + 597caebaffbc1304334f8e0433b015e46657cc1f @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/core-setup - 0613c0429e419649cc2688d314aee9b33ee8b967 + 3ee8e1e4e2259b66f5f3e74cc6a8fecd87dfd169 https://github.com/dotnet/arcade @@ -83,17 +83,17 @@ https://github.com/dotnet/corefx 5294f0da4695162603d24dba351c985181042796 - + https://github.com/dotnet/coreclr - d1bfda7c599d9683c972856a4f26c9b59f45c675 + 61957a9ba73a21337798cd6996317ace7d6f6023 - + https://github.com/dotnet/coreclr - d1bfda7c599d9683c972856a4f26c9b59f45c675 + 61957a9ba73a21337798cd6996317ace7d6f6023 - + https://github.com/dotnet/coreclr - d1bfda7c599d9683c972856a4f26c9b59f45c675 + 61957a9ba73a21337798cd6996317ace7d6f6023 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 0a5a0f3a2d4..10a07ab3526 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ - 4.8.0-preview8.19363.7 + 4.8.0-preview8.19363.8 - 3.0.0-preview8.19363.1 - 3.0.0-preview8.19363.1 - 3.0.0-preview8.19363.1 + 3.0.0-preview8.19363.2 + 3.0.0-preview8.19363.2 + 3.0.0-preview8.19363.2 - 3.0.0-preview8-27913-06 + 3.0.0-preview8-27913-07 3.0.0-preview8.19363.3 4.6.0-preview8.19363.3 4.6.0-preview8.19363.3 From eee2e04532d39a7443615ab2cb36a603e5651075 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 05:30:48 +0000 Subject: [PATCH 096/227] Update dependencies from https://github.com/dotnet/winforms build 20190713.9 (#1258) - Microsoft.Private.Winforms - 4.8.0-preview8.19363.9 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19363.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-08 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c95fb22dcb..273fbf3b5ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 597caebaffbc1304334f8e0433b015e46657cc1f + 3a7855d9fd742d79f8c3b182cf007b47ae5f0c68 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/core-setup - 3ee8e1e4e2259b66f5f3e74cc6a8fecd87dfd169 + 36ad04d936c4613c1b1599b899071d411fe5c9b1 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 15f50ca6a9d0b441c9927421657fb9dc91206cc9 - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 0b93d365493c4ef8e211935c3ee12ad3821e517c - + https://github.com/dotnet/corefx - 5294f0da4695162603d24dba351c985181042796 + 750e954f0c82accded6ca7ac5a3b0c053de647a5 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 10a07ab3526..10ca979a9f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.4 - 4.8.0-preview8.19363.8 + 4.8.0-preview8.19363.9 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27913-07 - 3.0.0-preview8.19363.3 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 + 3.0.0-preview8-27913-08 + 3.0.0-preview8.19363.4 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 4.6.0-preview4.19176.11 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 - 4.6.0-preview8.19363.3 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 + 4.6.0-preview8.19363.4 From 01fecc817171c282671f9ec2976bf00c196ab0c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 06:05:51 +0000 Subject: [PATCH 097/227] Update dependencies from https://github.com/dotnet/winforms build 20190713.10 (#1259) - Microsoft.Private.Winforms - 4.8.0-preview8.19363.10 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27913-09 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 273fbf3b5ee..dd7eb1b8033 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 3a7855d9fd742d79f8c3b182cf007b47ae5f0c68 + a25ff188f5ac9a8df1e0ee8cbf8389f8fbebd816 @@ -59,7 +59,7 @@ https://github.com/dotnet/corefx 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/core-setup 36ad04d936c4613c1b1599b899071d411fe5c9b1 diff --git a/eng/Versions.props b/eng/Versions.props index 10ca979a9f8..5770859af13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19363.9 + 4.8.0-preview8.19363.10 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27913-08 + 3.0.0-preview8-27913-09 3.0.0-preview8.19363.4 4.6.0-preview8.19363.4 4.6.0-preview8.19363.4 From 4a2ac4b5d7bc973d2acb4527e14daea7a701dec7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 12:21:49 +0000 Subject: [PATCH 098/227] Update dependencies from https://github.com/dotnet/arcade build 20190713.1 (#1260) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19363.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19363.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19363.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19363.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19363.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd7eb1b8033..86b1ab2c63f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 36ad04d936c4613c1b1599b899071d411fe5c9b1 - + https://github.com/dotnet/arcade - 15f50ca6a9d0b441c9927421657fb9dc91206cc9 + 8c94bc75d29cd84e3592e4044100d45a341653f7 - + https://github.com/dotnet/arcade - 15f50ca6a9d0b441c9927421657fb9dc91206cc9 + 8c94bc75d29cd84e3592e4044100d45a341653f7 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 61957a9ba73a21337798cd6996317ace7d6f6023 - + https://github.com/dotnet/arcade - 15f50ca6a9d0b441c9927421657fb9dc91206cc9 + 8c94bc75d29cd84e3592e4044100d45a341653f7 - + https://github.com/dotnet/arcade - 15f50ca6a9d0b441c9927421657fb9dc91206cc9 + 8c94bc75d29cd84e3592e4044100d45a341653f7 - + https://github.com/dotnet/arcade - 15f50ca6a9d0b441c9927421657fb9dc91206cc9 + 8c94bc75d29cd84e3592e4044100d45a341653f7 diff --git a/eng/Versions.props b/eng/Versions.props index 5770859af13..d920d483265 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19362.5 - 1.0.0-beta.19362.5 - 1.0.0-beta.19362.5 + 1.0.0-beta.19363.1 + 1.0.0-beta.19363.1 + 1.0.0-beta.19363.1 diff --git a/global.json b/global.json index a5a5b92440a..7e9408681ed 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19362.5", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19362.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19363.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19363.1" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 13a2b01ec1f8f003523863d8392b61c925a5ac68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 13:10:08 +0000 Subject: [PATCH 099/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190713.2 (#1261) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19363.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86b1ab2c63f..3277aa50eff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 0b93d365493c4ef8e211935c3ee12ad3821e517c + cdb19db20ec200284131bd1e85c4be835a4ac094 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index d920d483265..484589de19d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19362.2 + 4.8.0-preview8.19363.2 From f3aba0912d41005f5fcbf603909ca00d8e7de582 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 17:05:53 +0000 Subject: [PATCH 100/227] Update dependencies from https://github.com/dotnet/winforms build 20190714.2 (#1263) - Microsoft.Private.Winforms - 4.8.0-preview8.19364.2 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-02 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3277aa50eff..1f34c4d5e8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - a25ff188f5ac9a8df1e0ee8cbf8389f8fbebd816 + 07d8ef9592d3da49c84faddcd541dd2622094f1a @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/core-setup - 36ad04d936c4613c1b1599b899071d411fe5c9b1 + 7d568120b9804180029e8a41799d287813493536 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 484589de19d..cd3e7dbbe4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19363.10 + 4.8.0-preview8.19364.2 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27913-09 + 3.0.0-preview8-27914-02 3.0.0-preview8.19363.4 4.6.0-preview8.19363.4 4.6.0-preview8.19363.4 From 0406cf4b458cc729a4d4b2b8495c39d0b94b275f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 17:40:53 +0000 Subject: [PATCH 101/227] Update dependencies from https://github.com/dotnet/winforms build 20190714.3 (#1265) - Microsoft.Private.Winforms - 4.8.0-preview8.19364.3 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-03 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f34c4d5e8a..d183d14fe3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 07d8ef9592d3da49c84faddcd541dd2622094f1a + caae0a54632a7c2cdc4ab46330ce3f97af6bee84 @@ -59,7 +59,7 @@ https://github.com/dotnet/corefx 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/core-setup 7d568120b9804180029e8a41799d287813493536 diff --git a/eng/Versions.props b/eng/Versions.props index cd3e7dbbe4c..422b18b724a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19364.2 + 4.8.0-preview8.19364.3 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27914-02 + 3.0.0-preview8-27914-03 3.0.0-preview8.19363.4 4.6.0-preview8.19363.4 4.6.0-preview8.19363.4 From 3debbda72e1be96146290bf4514cf6f442f9a9a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2019 18:50:50 +0000 Subject: [PATCH 102/227] Update dependencies from https://github.com/dotnet/winforms build 20190714.4 (#1266) - Microsoft.Private.Winforms - 4.8.0-preview8.19364.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-04 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d183d14fe3b..27456c47186 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - caae0a54632a7c2cdc4ab46330ce3f97af6bee84 + 034ee31b352060032c3d1db0d1066fcc3c30251c @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 750e954f0c82accded6ca7ac5a3b0c053de647a5 - + https://github.com/dotnet/core-setup - 7d568120b9804180029e8a41799d287813493536 + 63567ce455ef7b743437901f05b032f84940b602 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 422b18b724a..66265143f3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19364.3 + 4.8.0-preview8.19364.4 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27914-03 + 3.0.0-preview8-27914-04 3.0.0-preview8.19363.4 4.6.0-preview8.19363.4 4.6.0-preview8.19363.4 From b883965f13329a31395f03ee51f97b94e738b6af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 06:15:51 +0000 Subject: [PATCH 103/227] Update dependencies from https://github.com/dotnet/winforms build 20190714.5 (#1268) - Microsoft.Private.Winforms - 4.8.0-preview8.19364.5 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19364.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27914-06 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27456c47186..b5685c5432f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 034ee31b352060032c3d1db0d1066fcc3c30251c + a5ee8e118f6f8eecff2849aad27d8324ae1597b5 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/core-setup - 63567ce455ef7b743437901f05b032f84940b602 + 2bb2dcaeffb1dfeda077354449868ddac254bc3d https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 8c94bc75d29cd84e3592e4044100d45a341653f7 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int cdb19db20ec200284131bd1e85c4be835a4ac094 - + https://github.com/dotnet/corefx - 750e954f0c82accded6ca7ac5a3b0c053de647a5 + c14b80faff694bae4e085bad221e2e83410e5f33 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 66265143f3e..7315755fa9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19363.4 + 4.6.0-preview8.19364.1 - 4.8.0-preview8.19364.4 + 4.8.0-preview8.19364.5 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27914-04 - 3.0.0-preview8.19363.4 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 + 3.0.0-preview8-27914-06 + 3.0.0-preview8.19364.1 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 4.6.0-preview4.19176.11 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 - 4.6.0-preview8.19363.4 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 + 4.6.0-preview8.19364.1 From e94c60e1a81a180be2ca687b71a05bb96db9b02e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 12:23:23 +0000 Subject: [PATCH 104/227] Update dependencies from https://github.com/dotnet/arcade build 20190714.1 (#1270) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19364.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19364.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19364.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19364.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19364.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5685c5432f..e53db9a8f7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 2bb2dcaeffb1dfeda077354449868ddac254bc3d - + https://github.com/dotnet/arcade - 8c94bc75d29cd84e3592e4044100d45a341653f7 + 0c81c2bbdc49749e9940bc8858ebd16026d51277 - + https://github.com/dotnet/arcade - 8c94bc75d29cd84e3592e4044100d45a341653f7 + 0c81c2bbdc49749e9940bc8858ebd16026d51277 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 61957a9ba73a21337798cd6996317ace7d6f6023 - + https://github.com/dotnet/arcade - 8c94bc75d29cd84e3592e4044100d45a341653f7 + 0c81c2bbdc49749e9940bc8858ebd16026d51277 - + https://github.com/dotnet/arcade - 8c94bc75d29cd84e3592e4044100d45a341653f7 + 0c81c2bbdc49749e9940bc8858ebd16026d51277 - + https://github.com/dotnet/arcade - 8c94bc75d29cd84e3592e4044100d45a341653f7 + 0c81c2bbdc49749e9940bc8858ebd16026d51277 diff --git a/eng/Versions.props b/eng/Versions.props index 7315755fa9b..d95a15dcc82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19363.1 - 1.0.0-beta.19363.1 - 1.0.0-beta.19363.1 + 1.0.0-beta.19364.1 + 1.0.0-beta.19364.1 + 1.0.0-beta.19364.1 diff --git a/global.json b/global.json index 7e9408681ed..dfe8ed589fc 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19363.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19363.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19364.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19364.1" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 7d54cd55c420b085933580f344091f4253f22feb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 13:05:04 +0000 Subject: [PATCH 105/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190714.2 (#1271) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19364.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e53db9a8f7e..e33d1dbf363 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx c14b80faff694bae4e085bad221e2e83410e5f33 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - cdb19db20ec200284131bd1e85c4be835a4ac094 + f5533f92b506e2892187d77272f25ad343c4e489 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index d95a15dcc82..e21c2fb7c8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19363.2 + 4.8.0-preview8.19364.2 From ad96b4eb3bfd18dc3d85d0ed00740b644d6ba65a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 20:10:54 +0000 Subject: [PATCH 106/227] Update dependencies from https://github.com/dotnet/winforms build 20190715.1 (#1273) - Microsoft.Private.Winforms - 4.8.0-preview8.19365.1 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-03 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e33d1dbf363..60899286964 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - a5ee8e118f6f8eecff2849aad27d8324ae1597b5 + 2d947478c7612dfe52935efb0d96b0a1a33ea086 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx c14b80faff694bae4e085bad221e2e83410e5f33 - + https://github.com/dotnet/core-setup - 2bb2dcaeffb1dfeda077354449868ddac254bc3d + fb64a02da5f9bf8d86e48727f5083dd06f1b48a8 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e21c2fb7c8c..835e2e0a825 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19364.5 + 4.8.0-preview8.19365.1 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27914-06 + 3.0.0-preview8-27915-03 3.0.0-preview8.19364.1 4.6.0-preview8.19364.1 4.6.0-preview8.19364.1 From b3f488cba61e81b9aa7e40e5b1ccbb7876242eff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 23:25:54 +0000 Subject: [PATCH 107/227] Update dependencies from https://github.com/dotnet/winforms build 20190715.2 (#1274) - Microsoft.Private.Winforms - 4.8.0-preview8.19365.2 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19365.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-06 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60899286964..2268cfaf3d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 2d947478c7612dfe52935efb0d96b0a1a33ea086 + 5508e38c0c99567c1df9f50dee8b9f765feea9e4 - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e - + https://github.com/dotnet/core-setup - fb64a02da5f9bf8d86e48727f5083dd06f1b48a8 + c83f4e80011537784e2078e608c80ad90442de61 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 0c81c2bbdc49749e9940bc8858ebd16026d51277 - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int f5533f92b506e2892187d77272f25ad343c4e489 - + https://github.com/dotnet/corefx - c14b80faff694bae4e085bad221e2e83410e5f33 + 6f5655cededab0bff63de7111bc761089a9db09e https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 835e2e0a825..7f789f998ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19364.1 + 4.6.0-preview8.19365.2 - 4.8.0-preview8.19365.1 + 4.8.0-preview8.19365.2 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27915-03 - 3.0.0-preview8.19364.1 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 + 3.0.0-preview8-27915-06 + 3.0.0-preview8.19365.2 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 4.6.0-preview4.19176.11 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 - 4.6.0-preview8.19364.1 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.2 From 86a151a12e9f291e29eab500949cd00bc78240dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2019 23:33:11 +0000 Subject: [PATCH 108/227] Update dependencies from https://github.com/dotnet/arcade build 20190715.4 (#1275) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19365.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19365.4 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19365.4 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19365.4 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19365.4 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2268cfaf3d4..a622a3134a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup c83f4e80011537784e2078e608c80ad90442de61 - + https://github.com/dotnet/arcade - 0c81c2bbdc49749e9940bc8858ebd16026d51277 + fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 - + https://github.com/dotnet/arcade - 0c81c2bbdc49749e9940bc8858ebd16026d51277 + fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 61957a9ba73a21337798cd6996317ace7d6f6023 - + https://github.com/dotnet/arcade - 0c81c2bbdc49749e9940bc8858ebd16026d51277 + fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 - + https://github.com/dotnet/arcade - 0c81c2bbdc49749e9940bc8858ebd16026d51277 + fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 - + https://github.com/dotnet/arcade - 0c81c2bbdc49749e9940bc8858ebd16026d51277 + fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 diff --git a/eng/Versions.props b/eng/Versions.props index 7f789f998ce..8d668e27888 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19364.1 - 1.0.0-beta.19364.1 - 1.0.0-beta.19364.1 + 1.0.0-beta.19365.4 + 1.0.0-beta.19365.4 + 1.0.0-beta.19365.4 diff --git a/global.json b/global.json index dfe8ed589fc..259d8c51301 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19364.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19364.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19365.4", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19365.4" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From c04ffa4394128d23eaa150ed5a6d7533f91cd7a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2019 02:40:51 +0000 Subject: [PATCH 109/227] Update dependencies from https://github.com/dotnet/winforms build 20190715.3 (#1279) - Microsoft.Private.Winforms - 4.8.0-preview8.19365.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a622a3134a3..b7a9e300202 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 5508e38c0c99567c1df9f50dee8b9f765feea9e4 + 3e50b1b891e7eaf6711673ac17c0937f127843c9 diff --git a/eng/Versions.props b/eng/Versions.props index 8d668e27888..76992d49715 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19365.2 + 4.8.0-preview8.19365.3 From 073d28193d972ea198ab98d473d0f36eb260c7dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2019 15:16:03 +0000 Subject: [PATCH 110/227] [master] Update dependencies from dotnet/winforms (#1281) * Update dependencies from https://github.com/dotnet/winforms build 20190716.2 - Microsoft.Private.Winforms - 4.8.0-preview8.19366.2 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-02 (parent: Microsoft.Private.Winforms) * Update dependencies from https://github.com/dotnet/winforms build 20190716.1 - Microsoft.Private.Winforms - 4.8.0-preview8.19366.1 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19365.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27915-11 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7a9e300202..5d4e0f2c520 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 3e50b1b891e7eaf6711673ac17c0937f127843c9 + 24fb252f5905237d84f4a91b9c3e2096d2d94c28 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 - + https://github.com/dotnet/core-setup - c83f4e80011537784e2078e608c80ad90442de61 + ad9f7e33fb1a1be7eefb57849e7d71a4f9a488b2 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int f5533f92b506e2892187d77272f25ad343c4e489 - + https://github.com/dotnet/corefx - 6f5655cededab0bff63de7111bc761089a9db09e + 8973a72af9e3a2837d18e73041e2c8090d6871d1 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 76992d49715..2831d9c9f56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.12 - 4.8.0-preview8.19365.3 + 4.8.0-preview8.19366.1 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27915-06 - 3.0.0-preview8.19365.2 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 + 3.0.0-preview8-27915-11 + 3.0.0-preview8.19365.12 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 4.6.0-preview4.19176.11 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 - 4.6.0-preview8.19365.2 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.12 From 4ad3f0fb6ece5d1f091af4cb57ce6a0c84c92dab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2019 17:10:54 +0000 Subject: [PATCH 111/227] Update dependencies from https://github.com/dotnet/winforms build 20190716.3 (#1282) - Microsoft.Private.Winforms - 4.8.0-preview8.19366.3 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19365.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19366.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19366.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19366.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19366.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-03 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d4e0f2c520..67ee300fca7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 24fb252f5905237d84f4a91b9c3e2096d2d94c28 + b271a2e71eac2ae0fa62c2827fcafaaba8cc2ba1 - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/core-setup - ad9f7e33fb1a1be7eefb57849e7d71a4f9a488b2 + 828432edc47ad23dfdd045351d1939b1e4f0cb27 https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int f5533f92b506e2892187d77272f25ad343c4e489 - + https://github.com/dotnet/corefx - 8973a72af9e3a2837d18e73041e2c8090d6871d1 + 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/coreclr - 61957a9ba73a21337798cd6996317ace7d6f6023 + 7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae - + https://github.com/dotnet/coreclr - 61957a9ba73a21337798cd6996317ace7d6f6023 + 7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae - + https://github.com/dotnet/coreclr - 61957a9ba73a21337798cd6996317ace7d6f6023 + 7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2831d9c9f56..8196a04769e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.14 - 4.8.0-preview8.19366.1 + 4.8.0-preview8.19366.3 - 3.0.0-preview8.19363.2 - 3.0.0-preview8.19363.2 - 3.0.0-preview8.19363.2 + 3.0.0-preview8.19366.1 + 3.0.0-preview8.19366.1 + 3.0.0-preview8.19366.1 - 3.0.0-preview8-27915-11 - 3.0.0-preview8.19365.12 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 + 3.0.0-preview8-27916-03 + 3.0.0-preview8.19365.14 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 4.6.0-preview4.19176.11 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 - 4.6.0-preview8.19365.12 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 + 4.6.0-preview8.19365.14 From 10a3372967b797d24b05b35102255d474058925c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2019 18:05:59 +0000 Subject: [PATCH 112/227] Update dependencies from https://github.com/dotnet/winforms build 20190716.4 (#1283) - Microsoft.Private.Winforms - 4.8.0-preview8.19366.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-04 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67ee300fca7..a3097daa213 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - b271a2e71eac2ae0fa62c2827fcafaaba8cc2ba1 + fa013732d022c502768007ccdf354d1c565ec8c9 @@ -59,7 +59,7 @@ https://github.com/dotnet/corefx 4b348cc28f0ec996322d4d1a62cfae300f77604e - + https://github.com/dotnet/core-setup 828432edc47ad23dfdd045351d1939b1e4f0cb27 diff --git a/eng/Versions.props b/eng/Versions.props index 8196a04769e..b3ab1e62375 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19366.3 + 4.8.0-preview8.19366.4 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27916-03 + 3.0.0-preview8-27916-04 3.0.0-preview8.19365.14 4.6.0-preview8.19365.14 4.6.0-preview8.19365.14 From d2b69739fc5b9cca4e9adf13f33f44ae944bf15e Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Tue, 16 Jul 2019 12:17:34 -0700 Subject: [PATCH 113/227] Enable SplashScreen build-action for .NET Core 3.0 (#1276) * Fixes #299: .NET Core 3.0 has no SplashScreen Build Action. WinFX.targets has a condition for preventing SplashScreen build-action from running on .NET Framework 3.0 - which is specified overly broadly. Rewriting this condition to be more specific fixes the problem and brings the SplashScreen build action back to .NET Core 3.0. --- .../src/PresentationBuildTasks/Microsoft.WinFx.targets | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.targets index 5496449671b..e69dc43047d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.targets +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFx.targets @@ -573,7 +573,10 @@ - + From 28bb9f757979be9b4970528c40fbdc123db6554f Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Tue, 16 Jul 2019 12:45:26 -0700 Subject: [PATCH 114/227] Update localized strings that render \r\n as text (#1285) --- .../Resources/Strings.resx | 9 ++++++--- .../Resources/xlf/Strings.cs.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.de.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.es.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.fr.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.it.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.ja.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.ko.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.pl.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.pt-BR.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.ru.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.tr.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.zh-Hans.xlf | 20 ++++++++++++------- .../Resources/xlf/Strings.zh-Hant.xlf | 20 ++++++++++++------- 14 files changed, 175 insertions(+), 94 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx index 34bee49cf74..37dc5a6fbc8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx @@ -1027,10 +1027,12 @@ Too many files selected. Select fewer files and try again. - '{0}' does not exist.\r\nDo you want to create it? + '{0}' does not exist. +Do you want to create it? - '{0}' does not exist.\r\nVerify that the file name is correct. + '{0}' does not exist. +Verify that the file name is correct. '{0}' is not a valid file name. @@ -1042,7 +1044,8 @@ Filter index is not valid. - '{0}' already exists.\r\nDo you want to replace it? + '{0}' already exists. +Do you want to replace it? Cannot subclass a file dialog because sufficient memory is not available. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf index 9ae812bbd24..c5808961d95 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.cs.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - Prvek {0} neexistuje.\r\nChcete ho vytvořit? + '{0}' does not exist. +Do you want to create it? + Prvek {0} neexistuje. +Chcete ho vytvořit? - '{0}' does not exist.\r\nVerify that the file name is correct. - Prvek {0} neexistuje.\r\nOvěřte, zda je správný název souboru. + '{0}' does not exist. +Verify that the file name is correct. + Prvek {0} neexistuje. +Ověřte, zda je správný název souboru. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - Prvek {0} již existuje.\r\nChcete ho nahradit? + '{0}' already exists. +Do you want to replace it? + Prvek {0} již existuje. +Chcete ho nahradit? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf index 2cc42dab48f..399c5bb71a8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.de.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - "{0}" ist nicht vorhanden.\r\nMöchten Sie das Element erstellen? + '{0}' does not exist. +Do you want to create it? + "{0}" ist nicht vorhanden. +Möchten Sie das Element erstellen? - '{0}' does not exist.\r\nVerify that the file name is correct. - "{0}" ist nicht vorhanden.\r\nÜberprüfen Sie den Dateinamen. + '{0}' does not exist. +Verify that the file name is correct. + "{0}" ist nicht vorhanden. +Überprüfen Sie den Dateinamen. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - "{0}" ist bereits vorhanden.\r\nMöchten Sie das Element ersetzen? + '{0}' already exists. +Do you want to replace it? + "{0}" ist bereits vorhanden. +Möchten Sie das Element ersetzen? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.es.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.es.xlf index fb26bbd85ad..0a01f2d29c3 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.es.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.es.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - "{0}" no existe.\r\n¿Desea crearlo? + '{0}' does not exist. +Do you want to create it? + "{0}" no existe. +¿Desea crearlo? - '{0}' does not exist.\r\nVerify that the file name is correct. - "{0}" no existe.\r\nCompruebe que el nombre de archivo sea correcto. + '{0}' does not exist. +Verify that the file name is correct. + "{0}" no existe. +Compruebe que el nombre de archivo sea correcto. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - {0} ya existe.\r\n¿Desea reemplazarlo? + '{0}' already exists. +Do you want to replace it? + {0} ya existe. +¿Desea reemplazarlo? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.fr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.fr.xlf index 4923ec13524..d60dd880866 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.fr.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.fr.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - '{0}' n'existe pas.\r\nVoulez-vous le créer ? + '{0}' does not exist. +Do you want to create it? + '{0}' n'existe pas. +Voulez-vous le créer ? - '{0}' does not exist.\r\nVerify that the file name is correct. - '{0}' n'existe pas.\r\nVérifiez que le nom de fichier est correct. + '{0}' does not exist. +Verify that the file name is correct. + '{0}' n'existe pas. +Vérifiez que le nom de fichier est correct. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - '{0}' existe déjà.\r\nVoulez-vous le remplacer ? + '{0}' already exists. +Do you want to replace it? + '{0}' existe déjà. +Voulez-vous le remplacer ? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.it.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.it.xlf index b1da8dcfe78..ce85950c276 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.it.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.it.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - '{0}' non esiste.\r\nCrearlo? + '{0}' does not exist. +Do you want to create it? + '{0}' non esiste. +Crearlo? - '{0}' does not exist.\r\nVerify that the file name is correct. - '{0}' non esiste.\r\nVerificare che il nome file sia corretto. + '{0}' does not exist. +Verify that the file name is correct. + '{0}' non esiste. +Verificare che il nome file sia corretto. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - '{0}' già esistente.\r\nSostituirlo? + '{0}' already exists. +Do you want to replace it? + '{0}' già esistente. +Sostituirlo? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf index 8b54d5578ed..004a4084c03 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ja.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - '{0}' が存在しません。\r\n作成しますか? + '{0}' does not exist. +Do you want to create it? + '{0}' が存在しません。 +作成しますか? - '{0}' does not exist.\r\nVerify that the file name is correct. - '{0}' は存在しません。\r\nファイル名が正しいことをご確認ください。 + '{0}' does not exist. +Verify that the file name is correct. + '{0}' は存在しません。 +ファイル名が正しいことをご確認ください。 @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - '{0}' は既に存在します。\r\n置き換えますか? + '{0}' already exists. +Do you want to replace it? + '{0}' は既に存在します。 +置き換えますか? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf index 7c331c41751..ed6f68dbbce 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ko.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - '{0}'이(가) 없습니다.\r\n만드시겠습니까? + '{0}' does not exist. +Do you want to create it? + '{0}'이(가) 없습니다. +만드시겠습니까? - '{0}' does not exist.\r\nVerify that the file name is correct. - '{0}'이(가) 없습니다.\r\n파일 이름이 올바른지 확인하세요. + '{0}' does not exist. +Verify that the file name is correct. + '{0}'이(가) 없습니다. +파일 이름이 올바른지 확인하세요. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - ’{0}'이(가) 이미 있습니다.\r\n바꾸시겠습니까? + '{0}' already exists. +Do you want to replace it? + ’{0}'이(가) 이미 있습니다. +바꾸시겠습니까? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pl.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pl.xlf index 56b352a899a..c177ae3d797 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pl.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pl.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - Element „{0}” nie istnieje.\r\nCzy chcesz go utworzyć? + '{0}' does not exist. +Do you want to create it? + Element „{0}” nie istnieje. +Czy chcesz go utworzyć? - '{0}' does not exist.\r\nVerify that the file name is correct. - Element „{0}” nie istnieje.\r\nSprawdź, czy nazwa pliku jest prawidłowa. + '{0}' does not exist. +Verify that the file name is correct. + Element „{0}” nie istnieje. +Sprawdź, czy nazwa pliku jest prawidłowa. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - Element „{0}” już istnieje.\r\nCzy chcesz go zastąpić? + '{0}' already exists. +Do you want to replace it? + Element „{0}” już istnieje. +Czy chcesz go zastąpić? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf index 0d8f5085af5..6ee7e68d22b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.pt-BR.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - '{0}' não existe.\r\nDeseja criá-lo? + '{0}' does not exist. +Do you want to create it? + '{0}' não existe. +Deseja criá-lo? - '{0}' does not exist.\r\nVerify that the file name is correct. - '{0}' não existe.\r\nVerifique se o nome de arquivo está correto. + '{0}' does not exist. +Verify that the file name is correct. + '{0}' não existe. +Verifique se o nome de arquivo está correto. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - '{0}' já existe.\r\nDeseja substituí-lo? + '{0}' already exists. +Do you want to replace it? + '{0}' já existe. +Deseja substituí-lo? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ru.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ru.xlf index 7395bfeb60a..347a18bb8d0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ru.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.ru.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - "{0}" не существует.\r\nВы хотите создать его? + '{0}' does not exist. +Do you want to create it? + "{0}" не существует. +Вы хотите создать его? - '{0}' does not exist.\r\nVerify that the file name is correct. - "{0}" не существует.\r\nПроверьте имя файла. + '{0}' does not exist. +Verify that the file name is correct. + "{0}" не существует. +Проверьте имя файла. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - "{0}" уже существует.\r\nВы хотите заменить его? + '{0}' already exists. +Do you want to replace it? + "{0}" уже существует. +Вы хотите заменить его? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf index 5a5e038db94..43050226b59 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.tr.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - '{0}' yok.\r\nOluşturmak istiyor musunuz? + '{0}' does not exist. +Do you want to create it? + '{0}' yok. +Oluşturmak istiyor musunuz? - '{0}' does not exist.\r\nVerify that the file name is correct. - '{0}' yok.\r\nDosya adının doğru olduğunu kontrol edin. + '{0}' does not exist. +Verify that the file name is correct. + '{0}' yok. +Dosya adının doğru olduğunu kontrol edin. @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - '{0}' zaten var.\r\nDeğiştirmek istiyor musunuz? + '{0}' already exists. +Do you want to replace it? + '{0}' zaten var. +Değiştirmek istiyor musunuz? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hans.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hans.xlf index d31c37bba92..0c5e886b44c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hans.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - “{0}”不存在。\r\n是否创建? + '{0}' does not exist. +Do you want to create it? + “{0}”不存在。 +是否创建? - '{0}' does not exist.\r\nVerify that the file name is correct. - “{0}”不存在。\r\n请验证文件名是否正确。 + '{0}' does not exist. +Verify that the file name is correct. + “{0}”不存在。 +请验证文件名是否正确。 @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - “{0}”已存在。\r\n是否替换它? + '{0}' already exists. +Do you want to replace it? + “{0}”已存在。 +是否替换它? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hant.xlf b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hant.xlf index 02a9024ef3d..b9f6f16c0be 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/xlf/Strings.zh-Hant.xlf @@ -1613,13 +1613,17 @@ - '{0}' does not exist.\r\nDo you want to create it? - '{0}' 不存在。\r\n要建立嗎? + '{0}' does not exist. +Do you want to create it? + '{0}' 不存在。 +要建立嗎? - '{0}' does not exist.\r\nVerify that the file name is correct. - '{0}' 不存在。\r\n請確認檔案名稱正確。 + '{0}' does not exist. +Verify that the file name is correct. + '{0}' 不存在。 +請確認檔案名稱正確。 @@ -1638,8 +1642,10 @@ - '{0}' already exists.\r\nDo you want to replace it? - '{0}' 已存在。\r\n要取代掉嗎? + '{0}' already exists. +Do you want to replace it? + '{0}' 已存在。 +要取代掉嗎? @@ -6469,4 +6475,4 @@ - \ No newline at end of file + From 52f24ad1517fc4412c989ce684189d7249abd137 Mon Sep 17 00:00:00 2001 From: Dilip Ojha Date: Tue, 16 Jul 2019 14:08:39 -0700 Subject: [PATCH 115/227] Cleanup System.Security.Permissions using directives and more comments (#1272) * permissions cleanup * comment removals --- eng/WpfArcadeSdk/tools/TestProjects.targets | 1 - .../Automation/Peers/AutomationPeer.cs | 2 - .../Windows/Generated/ContentElement.cs | 1 - .../System/Windows/Generated/UIElement.cs | 1 - .../System/Windows/Generated/UIElement3D.cs | 1 - .../Input/Command/ApplicationCommands.cs | 1 - .../Windows/Input/Command/RoutedCommand.cs | 3 - .../System/Windows/Input/InputManager.cs | 24 ----- .../System/Windows/Input/InputMethod.cs | 8 +- .../System/Windows/Input/KeyEventArgs.cs | 3 - .../System/Windows/Input/KeyboardDevice.cs | 4 - .../Windows/Input/NotifyInputEventArgs.cs | 3 - .../Windows/Input/ProcessInputEventArgs.cs | 16 +--- .../Windows/Input/StagingAreaInputItem.cs | 6 -- .../System/Windows/Input/TextComposition.cs | 3 - .../Windows/Input/TextCompositionManager.cs | 9 -- .../System/Windows/InterOp/HwndTarget.cs | 3 - .../Media/Animation/Generated/Animatable.cs | 1 - .../ColorIndependentAnimationStorage.cs | 1 - .../DoubleIndependentAnimationStorage.cs | 1 - .../MatrixIndependentAnimationStorage.cs | 1 - .../Animation/Generated/ParallelTimeline.cs | 1 - .../Point3DIndependentAnimationStorage.cs | 1 - .../PointIndependentAnimationStorage.cs | 1 - .../QuaternionIndependentAnimationStorage.cs | 1 - .../RectIndependentAnimationStorage.cs | 1 - .../SizeIndependentAnimationStorage.cs | 1 - .../Media/Animation/Generated/Timeline.cs | 1 - .../Animation/Generated/TimelineCollection.cs | 1 - .../Animation/Generated/TimelineGroup.cs | 1 - .../Vector3DIndependentAnimationStorage.cs | 1 - .../Generated/BrushValueSerializer.cs | 1 - .../Generated/CacheModeValueSerializer.cs | 1 - .../DoubleCollectionValueSerializer.cs | 1 - .../Generated/GeometryValueSerializer.cs | 1 - .../Int32CollectionValueSerializer.cs | 1 - .../PathFigureCollectionValueSerializer.cs | 1 - .../PointCollectionValueSerializer.cs | 1 - .../Generated/TransformValueSerializer.cs | 1 - .../VectorCollectionValueSerializer.cs | 1 - .../Effects/Generated/BevelBitmapEffect.cs | 1 - .../Media/Effects/Generated/BitmapEffect.cs | 1 - .../Generated/BitmapEffectCollection.cs | 1 - .../Effects/Generated/BitmapEffectGroup.cs | 1 - .../Effects/Generated/BitmapEffectInput.cs | 1 - .../Effects/Generated/BlurBitmapEffect.cs | 1 - .../Media/Effects/Generated/BlurEffect.cs | 1 - .../Generated/DropShadowBitmapEffect.cs | 1 - .../Effects/Generated/DropShadowEffect.cs | 1 - .../Windows/Media/Effects/Generated/Effect.cs | 1 - .../Effects/Generated/EmbossBitmapEffect.cs | 1 - .../Effects/Generated/ImplicitInputBrush.cs | 1 - .../Generated/OuterGlowBitmapEffect.cs | 1 - .../Media/Effects/Generated/PixelShader.cs | 1 - .../Media/Effects/Generated/ShaderEffect.cs | 1 - .../Windows/Media/Generated/ArcSegment.cs | 1 - .../Windows/Media/Generated/BezierSegment.cs | 1 - .../Windows/Media/Generated/BitmapCache.cs | 1 - .../Media/Generated/BitmapCacheBrush.cs | 1 - .../System/Windows/Media/Generated/Brush.cs | 1 - .../Windows/Media/Generated/BrushConverter.cs | 1 - .../Windows/Media/Generated/CacheMode.cs | 1 - .../Media/Generated/CacheModeConverter.cs | 1 - .../Media/Generated/CombinedGeometry.cs | 1 - .../Windows/Media/Generated/DashStyle.cs | 1 - .../Media/Generated/DoubleCollection.cs | 1 - .../Generated/DoubleCollectionConverter.cs | 1 - .../System/Windows/Media/Generated/Drawing.cs | 1 - .../Windows/Media/Generated/DrawingBrush.cs | 1 - .../Media/Generated/DrawingCollection.cs | 1 - .../Windows/Media/Generated/DrawingContext.cs | 1 - .../DrawingContextDrawingContextWalker.cs | 1 - .../Media/Generated/DrawingContextWalker.cs | 1 - .../Windows/Media/Generated/DrawingGroup.cs | 1 - .../Windows/Media/Generated/DrawingImage.cs | 1 - .../Media/Generated/EllipseGeometry.cs | 1 - .../Media/Generated/GeneralTransform.cs | 1 - .../Generated/GeneralTransformCollection.cs | 1 - .../Media/Generated/GeneralTransformGroup.cs | 1 - .../Windows/Media/Generated/Geometry.cs | 1 - .../Media/Generated/GeometryCollection.cs | 1 - .../Media/Generated/GeometryConverter.cs | 1 - .../Media/Generated/GeometryDrawing.cs | 1 - .../Windows/Media/Generated/GeometryGroup.cs | 1 - .../Media/Generated/GlyphRunDrawing.cs | 1 - .../Windows/Media/Generated/GradientBrush.cs | 1 - .../Windows/Media/Generated/GradientStop.cs | 1 - .../Media/Generated/GradientStopCollection.cs | 1 - .../Windows/Media/Generated/GuidelineSet.cs | 1 - .../Windows/Media/Generated/ImageBrush.cs | 1 - .../Windows/Media/Generated/ImageDrawing.cs | 1 - .../Windows/Media/Generated/ImageSource.cs | 1 - .../Media/Generated/Int32Collection.cs | 1 - .../Generated/Int32CollectionConverter.cs | 1 - .../Windows/Media/Generated/LineGeometry.cs | 1 - .../Windows/Media/Generated/LineSegment.cs | 1 - .../Media/Generated/LinearGradientBrush.cs | 1 - .../Media/Generated/MatrixTransform.cs | 1 - .../Windows/Media/Generated/MediaTimeline.cs | 1 - .../Windows/Media/Generated/PathFigure.cs | 1 - .../Media/Generated/PathFigureCollection.cs | 1 - .../PathFigureCollectionConverter.cs | 1 - .../Windows/Media/Generated/PathGeometry.cs | 1 - .../Windows/Media/Generated/PathSegment.cs | 1 - .../Media/Generated/PathSegmentCollection.cs | 1 - .../System/Windows/Media/Generated/Pen.cs | 1 - .../Media/Generated/PointCollection.cs | 1 - .../Generated/PointCollectionConverter.cs | 1 - .../Media/Generated/PolyBezierSegment.cs | 1 - .../Generated/PolyBezierSegmentFigureLogic.cs | 1 - .../Media/Generated/PolyLineSegment.cs | 1 - .../Generated/PolyLineSegmentFigureLogic.cs | 1 - .../Generated/PolyQuadraticBezierSegment.cs | 1 - .../PolyQuadraticBezierSegmentFigureLogic.cs | 1 - .../Media/Generated/QuadraticBezierSegment.cs | 1 - .../Media/Generated/RadialGradientBrush.cs | 1 - .../Media/Generated/RectangleGeometry.cs | 1 - .../Windows/Media/Generated/RenderData.cs | 1 - .../Generated/RenderDataDrawingContext.cs | 1 - .../Media/Generated/RotateTransform.cs | 1 - .../Windows/Media/Generated/ScaleTransform.cs | 1 - .../Windows/Media/Generated/SkewTransform.cs | 1 - .../Media/Generated/SolidColorBrush.cs | 1 - .../Windows/Media/Generated/StreamGeometry.cs | 1 - .../Windows/Media/Generated/TextEffect.cs | 1 - .../Media/Generated/TextEffectCollection.cs | 1 - .../Windows/Media/Generated/TileBrush.cs | 1 - .../Windows/Media/Generated/Transform.cs | 1 - .../Media/Generated/TransformCollection.cs | 1 - .../Media/Generated/TransformConverter.cs | 1 - .../Windows/Media/Generated/TransformGroup.cs | 1 - .../Media/Generated/TranslateTransform.cs | 1 - .../Media/Generated/VectorCollection.cs | 1 - .../Generated/VectorCollectionConverter.cs | 1 - .../Windows/Media/Generated/VideoDrawing.cs | 1 - .../Windows/Media/Generated/VisualBrush.cs | 1 - .../Windows/Media/Imaging/BitmapCodecInfo.cs | 36 -------- .../Media/Imaging/LateBoundBitmapDecoder.cs | 3 - .../Generated/Matrix3DValueSerializer.cs | 1 - .../Point3DCollectionValueSerializer.cs | 1 - .../Generated/Point3DValueSerializer.cs | 1 - .../Generated/Point4DValueSerializer.cs | 1 - .../Generated/QuaternionValueSerializer.cs | 1 - .../Generated/Rect3DValueSerializer.cs | 1 - .../Generated/Size3DValueSerializer.cs | 1 - .../Vector3DCollectionValueSerializer.cs | 1 - .../Generated/Vector3DValueSerializer.cs | 1 - .../Media3D/Generated/AffineTransform3D.cs | 1 - .../Windows/Media3D/Generated/AmbientLight.cs | 1 - .../Media3D/Generated/AxisAngleRotation3D.cs | 1 - .../Windows/Media3D/Generated/Camera.cs | 1 - .../Media3D/Generated/DiffuseMaterial.cs | 1 - .../Media3D/Generated/DirectionalLight.cs | 1 - .../Media3D/Generated/EmissiveMaterial.cs | 1 - .../Media3D/Generated/GeneralTransform3D.cs | 1 - .../Generated/GeneralTransform3DCollection.cs | 1 - .../Generated/GeneralTransform3DGroup.cs | 1 - .../Windows/Media3D/Generated/Geometry3D.cs | 1 - .../Media3D/Generated/GeometryModel3D.cs | 1 - .../System/Windows/Media3D/Generated/Light.cs | 1 - .../Windows/Media3D/Generated/Material.cs | 1 - .../Media3D/Generated/MaterialCollection.cs | 1 - .../Media3D/Generated/MaterialGroup.cs | 1 - .../Windows/Media3D/Generated/Matrix3D.cs | 1 - .../Media3D/Generated/Matrix3DConverter.cs | 1 - .../Windows/Media3D/Generated/MatrixCamera.cs | 1 - .../Media3D/Generated/MatrixTransform3D.cs | 1 - .../Media3D/Generated/MeshGeometry3D.cs | 1 - .../Windows/Media3D/Generated/Model3D.cs | 1 - .../Media3D/Generated/Model3DCollection.cs | 1 - .../Windows/Media3D/Generated/Model3DGroup.cs | 1 - .../Media3D/Generated/OrthographicCamera.cs | 1 - .../Media3D/Generated/PerspectiveCamera.cs | 1 - .../Windows/Media3D/Generated/Point3D.cs | 1 - .../Media3D/Generated/Point3DCollection.cs | 1 - .../Generated/Point3DCollectionConverter.cs | 1 - .../Media3D/Generated/Point3DConverter.cs | 1 - .../Windows/Media3D/Generated/Point4D.cs | 1 - .../Media3D/Generated/Point4DConverter.cs | 1 - .../Windows/Media3D/Generated/PointLight.cs | 1 - .../Media3D/Generated/PointLightBase.cs | 1 - .../Media3D/Generated/ProjectionCamera.cs | 1 - .../Windows/Media3D/Generated/Quaternion.cs | 1 - .../Media3D/Generated/QuaternionConverter.cs | 1 - .../Media3D/Generated/QuaternionRotation3D.cs | 1 - .../Windows/Media3D/Generated/Rect3D.cs | 1 - .../Media3D/Generated/Rect3DConverter.cs | 1 - .../Media3D/Generated/RotateTransform3D.cs | 1 - .../Windows/Media3D/Generated/Rotation3D.cs | 1 - .../Media3D/Generated/ScaleTransform3D.cs | 1 - .../Windows/Media3D/Generated/Size3D.cs | 1 - .../Media3D/Generated/Size3DConverter.cs | 1 - .../Media3D/Generated/SpecularMaterial.cs | 1 - .../Windows/Media3D/Generated/SpotLight.cs | 1 - .../Windows/Media3D/Generated/Transform3D.cs | 1 - .../Generated/Transform3DCollection.cs | 1 - .../Media3D/Generated/Transform3DGroup.cs | 1 - .../Media3D/Generated/TranslateTransform3D.cs | 1 - .../Windows/Media3D/Generated/Vector3D.cs | 1 - .../Media3D/Generated/Vector3DCollection.cs | 1 - .../Generated/Vector3DCollectionConverter.cs | 1 - .../Media3D/Generated/Vector3DConverter.cs | 1 - .../Windows/Media3D/Generated/Visual3D.cs | 1 - .../Microsoft/Win32/FileDialog.cs | 33 ------- .../Documents/FrameworkTextComposition.cs | 3 - .../Windows/Documents/NLGSpellerInterop.cs | 3 - .../Windows/Documents/SpellerInteropBase.cs | 3 - .../Generated/FrameworkContentElement.cs | 1 - .../Windows/Generated/FrameworkElement.cs | 1 - .../src/Shared/System/Windows/Ink/KnownIds.cs | 1 - .../System/Windows/Automation/Automation.cs | 55 ------------ .../Windows/Automation/AutomationElement.cs | 90 ------------------- .../System/Windows/Automation/DockPattern.cs | 10 --- .../Automation/ExpandCollapsePattern.cs | 15 ---- .../Windows/Automation/GridItemPattern.cs | 25 ------ .../System/Windows/Automation/GridPattern.cs | 15 ---- .../Windows/Automation/InvokePattern.cs | 5 -- .../Windows/Automation/MultipleViewPattern.cs | 20 ----- .../Windows/Automation/RangeValuePattern.cs | 35 -------- .../Windows/Automation/ScrollPattern.cs | 50 ----------- .../Automation/SelectionItemPattern.cs | 25 ------ .../Windows/Automation/SelectionPattern.cs | 15 ---- .../Windows/Automation/TableItemPattern.cs | 35 -------- .../System/Windows/Automation/TablePattern.cs | 25 ------ .../Windows/Automation/TogglePattern.cs | 10 --- .../Windows/Automation/TransformPattern.cs | 28 ------ .../System/Windows/Automation/ValuePattern.cs | 15 ---- .../Windows/Automation/WindowPattern.cs | 40 --------- .../Windows/Interop/ComponentDispatcher.cs | 33 ------- .../System/Windows/Threading/Dispatcher.cs | 17 ---- .../Windows/Threading/DispatcherHooks.cs | 6 -- 231 files changed, 3 insertions(+), 923 deletions(-) diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets index 335d9cacf16..1cd360f2579 100644 --- a/eng/WpfArcadeSdk/tools/TestProjects.targets +++ b/eng/WpfArcadeSdk/tools/TestProjects.targets @@ -30,7 +30,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs index e58374c4af1..d849acd5c65 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs @@ -219,8 +219,6 @@ public sealed class HostedWindowWrapper { /// /// This is the only public constructor on this class. - /// It requires "Full Trust" level of security permissions to be executed, since this - /// class is wrappign an HWND direct access to which is a critical asset. /// public HostedWindowWrapper(IntPtr hwnd) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs index 8e759c3065f..d0116fd1d88 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs @@ -18,7 +18,6 @@ using System.ComponentModel; using System.Diagnostics; using System.Security; -using System.Security.Permissions; using System.Windows.Input; using System.Windows.Media.Animation; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs index 1bfdf9c69b1..dffc1af620d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs @@ -18,7 +18,6 @@ using System.ComponentModel; using System.Diagnostics; using System.Security; -using System.Security.Permissions; using System.Windows.Input; using System.Windows.Media.Animation; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs index 2c3bb2b5041..618b635fcdc 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs @@ -18,7 +18,6 @@ using System.ComponentModel; using System.Diagnostics; using System.Security; -using System.Security.Permissions; using System.Windows.Input; using System.Windows.Media.Animation; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ApplicationCommands.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ApplicationCommands.cs index fe46b828821..89cfe542d18 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ApplicationCommands.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ApplicationCommands.cs @@ -20,7 +20,6 @@ using System.Collections; using System.ComponentModel; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using MS.Internal; // CommandHelper diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs index 74a71f57d08..bf6a5f44320 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs @@ -284,9 +284,6 @@ private InputGestureCollection GetInputGestures() /// Will be set by Rights Management code. /// /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// internal bool IsBlockedByRM { get diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs index 5678e36cc7f..2659a810bd8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs @@ -40,9 +40,6 @@ public sealed class InputManager : DispatcherObject /// /// Return the input manager associated with the current context. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static InputManager Current { get @@ -180,10 +177,6 @@ private InputManager() _inputTimer.Interval = TimeSpan.FromMilliseconds(125); } - /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public event PreProcessInputEventHandler PreProcessInput { add @@ -196,11 +189,6 @@ public event PreProcessInputEventHandler PreProcessInput } } - - /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public event NotifyInputEventHandler PreNotifyInput { add @@ -212,10 +200,6 @@ public event NotifyInputEventHandler PreNotifyInput _preNotifyInput -= value; } } - /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public event NotifyInputEventHandler PostNotifyInput { add @@ -228,10 +212,6 @@ public event NotifyInputEventHandler PostNotifyInput } } - /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public event ProcessInputEventHandler PostProcessInput { add @@ -300,9 +280,6 @@ internal void UnregisterInputProvider(IInputProvider inputProvider) /// /// Returns a collection of input providers registered with the input manager. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public ICollection InputProviders { get @@ -568,7 +545,6 @@ private void ValidateInputDevices(object sender, EventArgs e) /// The specified input is processed by all of the filters and /// monitors, and is finally dispatched to the appropriate /// element as an input event. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// /// /// Whether or not any event generated as a consequence of this diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethod.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethod.cs index b6fedefa34a..36d80603e81 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethod.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethod.cs @@ -642,10 +642,7 @@ public InputMethodState ImeState /// /// Access the current microphone on/off status. - /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// + /// public InputMethodState MicrophoneState { get @@ -716,9 +713,6 @@ public InputMethodState HandwritingState /// /// Access the current speech mode /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public SpeechMode SpeechMode { get diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyEventArgs.cs index eaa7584ce3e..d3c6e6db210 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyEventArgs.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyEventArgs.cs @@ -51,9 +51,6 @@ public KeyEventArgs(KeyboardDevice keyboard, PresentationSource inputSource, int /// /// The input source that provided this input. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public PresentationSource InputSource { get diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs index ebd878c9acd..a2234754b1a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs @@ -88,10 +88,6 @@ internal IInputElement ForceTarget /// /// Returns the PresentationSource that is reporting input for this device. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// - public override PresentationSource ActiveSource { get diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/NotifyInputEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/NotifyInputEventArgs.cs index d44f310847b..9e37d2f09fe 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/NotifyInputEventArgs.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/NotifyInputEventArgs.cs @@ -40,9 +40,6 @@ internal virtual void Reset(StagingAreaInputItem input, InputManager inputManage /// /// The input manager processing the input event. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public InputManager InputManager { get diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ProcessInputEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ProcessInputEventArgs.cs index 599aaadd6fa..4cc1c078c9a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ProcessInputEventArgs.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ProcessInputEventArgs.cs @@ -50,9 +50,6 @@ internal override void Reset(StagingAreaInputItem input, InputManager inputManag /// /// The staging area input item that wraps the specified input. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public StagingAreaInputItem PushInput(InputEventArgs input, StagingAreaInputItem promote) // Note: this should be a bool, and always use the InputItem available on these args. { @@ -73,10 +70,7 @@ public StagingAreaInputItem PushInput(InputEventArgs input, /// /// /// The specified staging area input item. - /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// + /// public StagingAreaInputItem PushInput(StagingAreaInputItem input) { if(!_allowAccessToStagingArea) @@ -93,10 +87,7 @@ public StagingAreaInputItem PushInput(StagingAreaInputItem input) /// /// The input event that was on the top of the staging area. /// This can be null, if the staging area was empty. - /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// + /// public StagingAreaInputItem PopInput() { @@ -115,9 +106,6 @@ public StagingAreaInputItem PopInput() /// The input event that is on the top of the staging area. /// This can be null, if the staging area is empty. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public StagingAreaInputItem PeekInput() { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/StagingAreaInputItem.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/StagingAreaInputItem.cs index 27b3fc2fe4c..294367d7acb 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/StagingAreaInputItem.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/StagingAreaInputItem.cs @@ -50,9 +50,6 @@ internal void Reset(InputEventArgs input, StagingAreaInputItem promote) /// /// Returns the input event. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public InputEventArgs Input { get {return _input;} @@ -83,9 +80,6 @@ public object GetData(object key) /// /// The data to set for this key. This can be null. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public void SetData(object key, object value) { _dictionary[key] = value; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextComposition.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextComposition.cs index b0188ff8f03..a9421387a07 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextComposition.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextComposition.cs @@ -142,9 +142,6 @@ internal TextComposition(InputManager inputManager, IInputElement source, string /// /// Finalize the composition. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public virtual void Complete() { // VerifyAccess(); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionManager.cs index 467645bc080..5347121921f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionManager.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionManager.cs @@ -285,9 +285,6 @@ internal TextCompositionManager(InputManager inputManager) /// /// Start the composition. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static bool StartComposition(TextComposition composition) { return UnsafeStartComposition(composition); @@ -296,9 +293,6 @@ public static bool StartComposition(TextComposition composition) /// /// Update the composition. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static bool UpdateComposition(TextComposition composition) { return UnsafeUpdateComposition(composition); @@ -307,9 +301,6 @@ public static bool UpdateComposition(TextComposition composition) /// /// Complete the composition. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static bool CompleteComposition(TextComposition composition) { return UnsafeCompleteComposition(composition); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs index 2a86fae2b25..10ecb5fbeea 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs @@ -2631,9 +2631,6 @@ public bool DetachHwndTarget(HwndTarget hwndTarget) /// /// Handles the messages for the notification window /// - /// - /// Critical: Elevates permissions via unsafe native methods - /// private IntPtr NotificationFilterMessage(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) { IntPtr retInt = IntPtr.Zero; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs index 7f365a97a44..992f1405316 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs @@ -22,7 +22,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Security; -using System.Security.Permissions; using System.Windows.Threading; using System.Windows.Media.Animation; using System.Windows.Media.Composition; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs index f0465e7e3ad..3d0334bd3b5 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs index 3c02c8ed812..f7670d03e25 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs index 401371124c9..5f2a776bb41 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs index e5ed29134e6..6c428e066ae 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs @@ -33,7 +33,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DIndependentAnimationStorage.cs index 0eae4c3c0a9..389d1c17fd8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs index 347234b0f5e..a98239f01ec 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionIndependentAnimationStorage.cs index 1f33f4eaee1..513ca454828 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs index 70bc838551e..715912da516 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs index b99351025aa..dd6020b839f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs index 09287702e9c..472c086a292 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs @@ -33,7 +33,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs index bb5f85687e3..700afe339d9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs @@ -33,7 +33,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs index fa7caaacc8a..4cbe373aba6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs @@ -33,7 +33,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DIndependentAnimationStorage.cs index 1c82d624931..a719b2f8332 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DIndependentAnimationStorage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DIndependentAnimationStorage.cs @@ -22,7 +22,6 @@ using System.Windows.Media.Composition; using System.Windows.Media.Media3D; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media.Animation { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs index 425036f747f..27850ba4699 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs index bce5b0a8cd1..2b20f352475 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs index 930e5211647..692b65576ff 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs index 8e49f76ccd2..62db56543f7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs index 773540bc0f7..6bda836ce7b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs index b4a575d76b5..eb6fc8706e6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs index 1a3a00a572d..7d51826abd6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs index fff6f4578a5..ff4962a08a6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs index c20abb7ed69..83601e0da74 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs index 075fa5c43a0..a9431f51bc2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs index 0f660230549..fc5f7c56dfb 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs index 2a387271c6d..3d45f6cd7e0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs index e169fc02779..d21e33ab12a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs index cced4991810..d6b98471ebb 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs index 0555613f0e1..dc861cedb68 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs index f29b1b28054..e435599719e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR = MS.Internal.PresentationCore.SR; using SRID = MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs index 8b7bf2530b7..ee9617e461b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs index 5f496d3facd..a7562b939fb 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs index 1c25754fd58..a7f81d466b9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs index d1cb124195d..d74c24ef501 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs index aaa16ac7800..0d8d88189c9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs index 9957bc5ada0..2f6689016c7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs index f959ec14764..a860a32c287 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs index 393b0935d2a..c0fffc01430 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs @@ -32,7 +32,6 @@ using System.Windows.Media.Imaging; using System.Windows.Markup; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs index 82e85f9d6c0..bbe6b03572f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs index 8bd95c85973..753cf4efa21 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs index 8311f465d94..d437cda58e3 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs index cbd5163f41e..592c18b80e9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs index 613206f03fa..58da793051a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs index 5073be56597..2992c50b291 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs index fb5336dc5fa..92c4604d614 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs index 11547957e2c..1ccc1a9e4af 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs index f7eb2b68643..bf1d49da806 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs index 132353508fd..476ba9d3812 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs index 93e69a79b11..ac7be612422 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs index fc548c0b413..67bdd5d3f68 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs index f283b69edd9..e5609b1318a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs index 65c57b3ba3b..0614d0da30a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs index a223b73d8a8..726bdd0ceaf 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs index e4af20907bc..7c190f2cc1c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs @@ -27,7 +27,6 @@ using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs index 0a43f23700a..78885f5c8c2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs @@ -27,7 +27,6 @@ using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs index 35006ceef22..6560c152be1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs @@ -27,7 +27,6 @@ using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs index 8db27943f49..4df39e621fb 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs index 7432a03ea17..f573c9ca99b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs index dbc5a4130c7..d571c2ba332 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs index 847738682b9..40adcc2e353 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs index b74da4e0e59..e1dfc03f45d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs index 2dc331f0e3d..3d63ef3f737 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs index adf72e27e73..4052f543473 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs index 8da5c936286..30f356bf67e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs index 55cbab3797d..b8264ce4f73 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs index fcc00cf9afc..416ff169d0b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs index 74ee066627d..cec65890e11 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs index 3734fd93c94..e7c81782f17 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs index 9dd0a50a28c..c0c8c68c580 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStop.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStop.cs index a8123e3b560..c59fac0d164 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStop.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStop.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs index 389991851f4..311caf539b7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs index 08c693fc2f0..9894787c1cd 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs index 30e91d48165..ee911a5d1d5 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs index 938d446ecb6..54c8475ae42 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs index f856051f505..1f3dbacac89 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs index 09a087be6d7..63582db327a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs index faed9133c7c..eb0f3427871 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs index 16c7eef60bb..76334d8da93 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs index a40a4ad28d2..62fcae25507 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs index a3ba16f2cbe..395b75f1bb8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs index 547346616cf..8c002680bc4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs index 42d10c9c8e6..f5793c86328 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs index 991a8086cbd..c1b1b2d7440 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs index 66d094fac4e..6c6d1b6a2a9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs index e1f46cc43d7..2e8847c848d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs index b94f6f23b7f..68d48ee4c8b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs index 0ef22231e5f..7f677130d9e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs index 132f9781459..9385606444c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs index 2fb57adfee8..ae538e7dd22 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs index 6e62ca4b243..df26f644f28 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs index d3a82602ef0..69515716d4d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs index 8bbbd31849a..70afd84f212 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs index 934af99aba6..3d201d3c7d4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs @@ -16,7 +16,6 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; -using System.Security.Permissions; using System.Windows; using System.Windows.Markup; using System.Windows.Media.Animation; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs index 66816e12adb..78e47c703b8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs index 73b8ee6c13b..b3520d0dd1a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs @@ -16,7 +16,6 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; -using System.Security.Permissions; using System.Windows; using System.Windows.Markup; using System.Windows.Media.Animation; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs index 9418724a01c..a47f672fb40 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs index e04720943af..6ca1ac8db57 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs @@ -16,7 +16,6 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; -using System.Security.Permissions; using System.Windows; using System.Windows.Markup; using System.Windows.Media.Animation; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs index f56e4034043..d41e6aa4ba4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs index 388330f2bef..b65f2ffe5cf 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs index e406260d0c2..0ce9ae5570a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs index 4044985886f..5c83c0bd2eb 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs @@ -27,7 +27,6 @@ using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs index 4394730dd97..a507cd0ed37 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs @@ -27,7 +27,6 @@ using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Security; -using System.Security.Permissions; namespace System.Windows.Media { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs index 8eb2f609859..49153831c1b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs index 827b0d9cf96..b83a7fa9797 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs index 7f821ae6f3e..3229250d734 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs index cd2dcddd4c5..fa372a93063 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs index cf334d3fd20..f55e1f4db05 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs index 7418a167460..12df3023aa6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs index d24cb1eaa5d..2da2ca103d5 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs index 3e4d2ecc550..363910c9402 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs index 141f2ce5b69..53f86f02a6e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs index 38eb88d2d91..8fe930b5d18 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs index cce5974abce..8a479e27b32 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs index 82b83c017f0..06917c4a246 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs index ee406deaff8..dbe43ccfec2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs index c800346f83c..78120609e56 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs index 0e712fdc65f..681c6ac56f3 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs index 2492c833fd1..b8f0175d290 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs index fa6c169cc91..21f16e79294 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs @@ -34,7 +34,6 @@ using System.Windows.Markup; using System.Windows.Media.Converters; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; // These types are aliased to match the unamanaged names used in interop diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCodecInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCodecInfo.cs index 5451835d29c..be666732c2a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCodecInfo.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCodecInfo.cs @@ -58,9 +58,6 @@ internal BitmapCodecInfo(SafeMILHandle codecInfoHandle) /// /// Container format /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual Guid ContainerFormat { get @@ -82,9 +79,6 @@ out containerFormat /// /// Author /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual string Author { get @@ -128,9 +122,6 @@ out length /// /// Version /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual System.Version Version { get @@ -174,9 +165,6 @@ out length /// /// Spec Version /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual Version SpecificationVersion { get @@ -220,9 +208,6 @@ out length /// /// Friendly Name /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual string FriendlyName { get @@ -266,9 +251,6 @@ out length /// /// Device Manufacturer /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual string DeviceManufacturer { get @@ -312,9 +294,6 @@ out length /// /// Device Models /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual string DeviceModels { get @@ -358,9 +337,6 @@ out length /// /// Mime types /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual string MimeTypes { get @@ -404,9 +380,6 @@ out length /// /// File extensions /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual string FileExtensions { get @@ -450,9 +423,6 @@ out length /// /// Does Support Animation /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual bool SupportsAnimation { get @@ -474,9 +444,6 @@ out supportsAnimation /// /// Does Support Lossless /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual bool SupportsLossless { get @@ -498,9 +465,6 @@ out supportsLossless /// /// Does Support Multiple Frames /// - /// - /// Callers must have RegistryPermission(PermissionState.Unrestricted) to call this API. - /// public virtual bool SupportsMultipleFrames { get diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/LateBoundBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/LateBoundBitmapDecoder.cs index 1e1dc470d08..6de09f2d0f9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/LateBoundBitmapDecoder.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/LateBoundBitmapDecoder.cs @@ -154,9 +154,6 @@ public override BitmapSource Thumbnail /// The info that identifies this codec. /// If the LateBoundDecoder is still downloading, the returned CodecInfo is null. /// - /// - /// The getter demands RegistryPermission(PermissionState.Unrestricted) - /// public override BitmapCodecInfo CodecInfo { get diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs index a87d03711f0..3e6903309fc 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs index 39708acf4ba..e15ee1253ef 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs index 0ca1b55e763..142cd55c174 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs index 1c83fb37c4a..9df1cb86fbe 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs index e3de8b434ab..12527cfb42e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs index a313332fa4f..f1ce866da93 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs index 137d21713bb..8d836188d93 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs index 8786aece92d..883db0dac03 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs index 06910b58882..0ca5d42d152 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs index 18d276472bf..d0619bd3b71 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs index f19ed7b3063..3161a3f344b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs index 63e404f766c..6806e55b22a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs index 61ec3783985..fc693d5b0b4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs index b637f60e35a..e9bd0259e6d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs index 6a107f48924..cd4a338008d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs index 491a659cd4b..9b06319996f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs index ad8b008a4f4..18a98ebd3a1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs index 3ec532387b3..adb0ff7a38a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs index cbcc10b7ebf..c7b591c7255 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs index 3c52913d55d..b6eccc17170 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs index 0049a97962c..3a6a5916df4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs index 114c0bcc3b6..1a8e5fba56d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs index 857abff5447..b229f9a9812 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs index 452391929b9..8df0f85b3a0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs index befe188e0ea..0c24d179e7e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs index ba10f17e5fd..728f5d0972e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs index 25f229c7402..4595866caec 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs index 7a6ecd1ceef..297cfb85da1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs index dec40e3a393..23317258bfa 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs index 31347bc911a..7fc0801a0bc 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs index 2c80e914e92..f9f3a23e614 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs index 7f43e355ff5..cf0fc2975a8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs index 5e7a3913b08..8f222d49b1d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs index b6fa402fd77..8815bb17ecc 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs index 70f9a9315c3..23ce11e5a94 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs index 114a27b8d5e..1b32bd0461d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs index e6a4593aabc..2ed205cf25f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs index 60bdb076a00..c00b10be886 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs index 1f1f4a53de0..00810d3ee4a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs index 590d8961729..d7ecdc66254 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs index 20d2b840004..7144b4e73b7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs index 2dfd8b51598..5e8506ee61c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs index 67ad9be1319..bf0975c4d84 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs index 1faae30945d..0d5b7a17972 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs index 4e7fc9f9fed..e86779c37b1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs index 714dd8e66da..1543637c5d7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs index b608bf76868..1ad56e66a24 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs index eb3d0571882..9b53320c884 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs index 5f5a039f49c..13613c8b76f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs index 0a13b6c2c9a..bef0aad09b8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs index 9f2a78fee40..0e60d819ec7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs index 8b45564b47b..dcd8b814217 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs index 1ddbfca4729..311686635e3 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs index e9eb6cf06b4..969440647e5 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs index 3a289e0823e..548ee8f1917 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs index 73ac17e3c16..7a4253011c2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs index 49a9f4fb9c9..bc828c05738 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs index 02fc45f27fb..b39668504d3 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs index 4b72735cef8..85fa102651c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs index 656bda951c7..f6c91946b68 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs index 0781da77e21..213c6371500 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs index b10f77ee1c2..62d393db2ab 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs index dae38b4613e..80938e8d97c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs index 3ec3314b001..cf1dcfc1433 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs @@ -29,7 +29,6 @@ using System.Windows.Media.Animation; using System.Windows.Media.Composition; using System.Security; -using System.Security.Permissions; using SR=MS.Internal.PresentationCore.SR; using SRID=MS.Internal.PresentationCore.SRID; using System.Windows.Media.Imaging; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs index 5f47197eee0..a83eaf733fd 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs @@ -22,7 +22,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Security; -using System.Security.Permissions; using System.Windows.Threading; using System.Windows.Media.Animation; using System.Windows.Media.Composition; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/FileDialog.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/FileDialog.cs index 33d03bbe9c4..150188d4fa3 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/FileDialog.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/FileDialog.cs @@ -88,9 +88,6 @@ protected FileDialog() /// implementation of Reset() if they choose to /// override this function. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public override void Reset() { @@ -136,9 +133,6 @@ public override string ToString() /// dialog box automatically adds an extension to a /// file name if the user omits the extension. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public bool AddExtension { get @@ -164,9 +158,6 @@ public bool AddExtension /// the dialog box displays a warning if the /// user specifies a file name that does not exist. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public virtual bool CheckFileExists { get @@ -186,9 +177,6 @@ public virtual bool CheckFileExists /// used and the user types an invalid path and file name in the File Name entry field, /// a warning is displayed in a message box. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public bool CheckPathExists { get @@ -245,9 +233,6 @@ public string DefaultExt /// of the file referenced by the shortcut or whether it returns the location /// of the shortcut (.lnk). /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public bool DereferenceLinks { get @@ -327,9 +312,6 @@ public string[] SafeFileNames /// Gets or sets a string containing the full path of the file selected in /// the file dialog box. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public string FileName { get @@ -360,9 +342,6 @@ public string FileName /// /// Gets the file names of all selected files in the dialog box. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public string[] FileNames { get @@ -466,9 +445,6 @@ public int FilterIndex /// /// Gets or sets the initial directory displayed by the file dialog box. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public string InitialDirectory { get @@ -490,9 +466,6 @@ public string InitialDirectory /// This property is only valid for SaveFileDialog; it has no effect /// when set on an OpenFileDialog. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public bool RestoreDirectory { get @@ -511,9 +484,6 @@ public bool RestoreDirectory /// If this property is null, a localized default from the operating /// system itself will be used (typically something like "Save As" or "Open") /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public string Title { get @@ -536,9 +506,6 @@ public string Title /// Gets or sets a value indicating whether the dialog box accepts only valid /// Win32 file names. /// - /// - /// Callers must have FileIOPermission(PermissionState.Unrestricted) to call this API. - /// public bool ValidateNames { get diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FrameworkTextComposition.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FrameworkTextComposition.cs index f12ce478998..a1bd4e8f778 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FrameworkTextComposition.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FrameworkTextComposition.cs @@ -60,9 +60,6 @@ internal FrameworkTextComposition(InputManager inputManager, IInputElement sourc /// We finalize Cicero's composition and TextStore will automatically /// generate the proper TextComposition events. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public override void Complete() { _pendingComplete = true; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/NLGSpellerInterop.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/NLGSpellerInterop.cs index 0b3f38258ce..2b4ac76b2f6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/NLGSpellerInterop.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/NLGSpellerInterop.cs @@ -314,9 +314,6 @@ internal override object LoadDictionary(string lexiconFilePath) /// which we created and filled with data from pack Uri locations specified by user. /// These 'trusted' files are placed under . /// - /// Explicitely specified file locations we will passed to ILexicon APIs without asserting - /// Security permissions, so it would pass in FullTrust and fail in PartialTrust. - /// /// Files specified in are wrapped in FileIOPermission.Assert(), /// providing read access to trusted files under , i.e. additionally /// we're making sure that specified trusted locations are under the trusted Folder. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/SpellerInteropBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/SpellerInteropBase.cs index 6f171f43b3b..56f926de50c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/SpellerInteropBase.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/SpellerInteropBase.cs @@ -175,9 +175,6 @@ internal abstract int EnumTextSegments(char[] text, int count, /// which we created and filled with data from pack Uri locations specified by user. /// These 'trusted' files are placed under . /// - /// Explicitly specified file locations will be passed to COM APIs without asserting - /// Security permissions, so it would pass in FullTrust and fail in PartialTrust. - /// /// Files specified in are wrapped in FileIOPermission.Assert(), /// providing read access to trusted files under , i.e. additionally /// we're making sure that specified trusted locations are under the trusted Folder. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkContentElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkContentElement.cs index 540514dab5c..c49f4b1f165 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkContentElement.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkContentElement.cs @@ -18,7 +18,6 @@ using System.Collections; using System.Diagnostics; using System.Security; -using System.Security.Permissions; using System.Windows.Controls; using System.Windows.Diagnostics; using System.Windows.Media; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkElement.cs index 92a399aa122..1066e2efac8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkElement.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Generated/FrameworkElement.cs @@ -18,7 +18,6 @@ using System.Collections; using System.Diagnostics; using System.Security; -using System.Security.Permissions; using System.Windows.Controls; using System.Windows.Diagnostics; using System.Windows.Media; diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Ink/KnownIds.cs b/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Ink/KnownIds.cs index b05962985a7..ace6cb79ff1 100644 --- a/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Ink/KnownIds.cs +++ b/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Ink/KnownIds.cs @@ -296,7 +296,6 @@ internal static class KnownIds internal static string ConvertToString (Guid id) { - // Assert Reflection permissions shouldn't be required since we are only accessing public members if (null == PublicMemberInfo) { PublicMemberInfo = typeof(KnownIds).FindMembers(System.Reflection.MemberTypes.Field, diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Automation.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Automation.cs index 89a02dfce20..8bd06637cf8 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Automation.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/Automation.cs @@ -71,11 +71,6 @@ public static class Automation /// element to compare /// true if el1 and el2 refer to the same underlying UI /// Both el1 and el1 must be non-null - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static bool Compare(AutomationElement el1, AutomationElement el2) { return Misc.Compare(el1, el2); @@ -89,11 +84,6 @@ public static bool Compare(AutomationElement el1, AutomationElement el2) /// true if runtimeId1 and runtimeId2 refer to the same underlying UI /// Both runtimeId1 and runtimeId2 must be non-null. Can be /// used to compare RuntimeIds from elements. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static bool Compare(int[] runtimeId1, int[] runtimeId2) { return Misc.Compare(runtimeId1, runtimeId2); @@ -138,11 +128,6 @@ public static string PatternName( AutomationPattern pattern ) /// Element on which to listen for control pattern or custom events. /// Specifies whether to listen to property changes events on the specified element, and/or its ancestors and children. /// Delegate to call when the specified event occurs. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void AddAutomationEventHandler( AutomationEvent eventId, AutomationElement element, @@ -215,11 +200,6 @@ AutomationEventHandler eventHandler /// a UIAccess or custom event identifier. /// Element to remove listener for /// The handler object that was passed to AddEventListener - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void RemoveAutomationEventHandler( AutomationEvent eventId, AutomationElement element, @@ -243,11 +223,6 @@ AutomationEventHandler eventHandler /// Specifies whether to listen to property changes events on the specified element, and/or its ancestors and children. /// Callback object to call when a specified property change occurs. /// Params array of properties to listen for changes in. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void AddAutomationPropertyChangedEventHandler( AutomationElement element, // reference element for listening to the event TreeScope scope, // scope to listen to @@ -281,11 +256,6 @@ public static void AddAutomationPropertyChangedEventHandler( /// /// Element to remove listener for /// The handler object that was passed to AutomationPropertyChangedEventHandler - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void RemoveAutomationPropertyChangedEventHandler( AutomationElement element, // reference element being listened to AutomationPropertyChangedEventHandler eventHandler // callback object (used as cookie here) @@ -304,11 +274,6 @@ public static void RemoveAutomationPropertyChangedEventHandler( /// Element on which to listen for structure change events. /// Specifies whether to listen to property changes events on the specified element, and/or its ancestors and children. /// Delegate to call when a structure change event occurs. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void AddStructureChangedEventHandler(AutomationElement element, TreeScope scope, StructureChangedEventHandler eventHandler) { Misc.ValidateArgumentNonNull(element, "element"); @@ -325,11 +290,6 @@ public static void AddStructureChangedEventHandler(AutomationElement element, Tr /// /// Element to remove listener for /// The handler object that was passed to AddStructureChangedListener - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void RemoveStructureChangedEventHandler(AutomationElement element, StructureChangedEventHandler eventHandler) { Misc.ValidateArgumentNonNull(element, "element"); @@ -343,11 +303,6 @@ public static void RemoveStructureChangedEventHandler(AutomationElement element, /// Called by a client to add a listener for focus changed events. /// /// Delegate to call when a focus change event occurs. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void AddAutomationFocusChangedEventHandler( AutomationFocusChangedEventHandler eventHandler ) @@ -366,11 +321,6 @@ AutomationFocusChangedEventHandler eventHandler /// Called by a client to remove a listener for focus changed events. /// /// The handler object that was passed to AddAutomationFocusChangedListener - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void RemoveAutomationFocusChangedEventHandler( AutomationFocusChangedEventHandler eventHandler ) @@ -384,11 +334,6 @@ AutomationFocusChangedEventHandler eventHandler /// /// Called by a client to remove all listeners that the client has added. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static void RemoveAllEventHandlers() { // Remove the client-side listener for for this event diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AutomationElement.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AutomationElement.cs index 365d15830e5..2ddf30f61c9 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AutomationElement.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/AutomationElement.cs @@ -370,11 +370,6 @@ public override int GetHashCode() /// These identifies are only guaranteed to be unique on a given desktop. /// Identifiers may be recycled over time. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int[] GetRuntimeId() { if (_runtimeId != null) @@ -408,11 +403,6 @@ public int[] GetRuntimeId() /// /// point in screen coordinates /// element at specified point - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static AutomationElement FromPoint(Point pt) { return DrillForPointOrFocus(true, pt, CacheRequest.CurrentUiaCacheRequest); @@ -423,11 +413,6 @@ public static AutomationElement FromPoint(Point pt) /// /// Handle of window to get element for /// element representing root node of specified window - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static AutomationElement FromHandle(IntPtr hwnd) { Misc.ValidateArgument(hwnd != IntPtr.Zero, SRID.HwndMustBeNonNULL); @@ -481,11 +466,6 @@ public static AutomationElement FromLocalProvider(IRawElementProviderSimple loca /// a cross-process performance hit. To access values in this AutomationElement's /// cache, use GetCachedPropertyValue instead. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public object GetCurrentPropertyValue(AutomationProperty property) { return GetCurrentPropertyValue(property, false); @@ -504,11 +484,6 @@ public object GetCurrentPropertyValue(AutomationProperty property) /// a cross-process performance hit. To access values in this AutomationElement's /// cache, use GetCachedPropertyValue instead. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public object GetCurrentPropertyValue(AutomationProperty property, bool ignoreDefaultValue) { Misc.ValidateArgumentNonNull(property, "property"); @@ -564,11 +539,6 @@ public object GetCurrentPropertyValue(AutomationProperty property, bool ignoreDe /// a cross-process performance hit. To access patterns in this AutomationElement's /// cache, use GetCachedPattern instead. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public object GetCurrentPattern(AutomationPattern pattern) { object retObject; @@ -596,11 +566,6 @@ public object GetCurrentPattern(AutomationPattern pattern) /// a cross-process performance hit. To access patterns in this AutomationElement's /// cache, use GetCachedPattern instead. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool TryGetCurrentPattern(AutomationPattern pattern, out object patternObject) { patternObject = null; @@ -645,11 +610,6 @@ public bool TryGetCurrentPattern(AutomationPattern pattern, out object patternOb /// support the AutomationElement.NameProperty, calling GetCachedPropertyValue /// for that property will return an empty string. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public object GetCachedPropertyValue(AutomationProperty property) { return GetCachedPropertyValue(property, false); @@ -674,11 +634,6 @@ public object GetCachedPropertyValue(AutomationProperty property) /// When ignoreDefaultValue is true, the value AutomationElement.NotSupported will /// be returned instead. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public object GetCachedPropertyValue(AutomationProperty property, bool ignoreDefaultValue) { Misc.ValidateArgumentNonNull(property, "property"); @@ -707,11 +662,6 @@ public object GetCachedPropertyValue(AutomationProperty property, bool ignoreDef /// /// This API gets the pattern from the cache. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public object GetCachedPattern(AutomationPattern pattern) { object patternObject; @@ -731,11 +681,6 @@ public object GetCachedPattern(AutomationPattern pattern) /// /// This API gets the pattern from the cache. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool TryGetCachedPattern(AutomationPattern pattern, out object patternObject) { patternObject = null; @@ -843,11 +788,6 @@ public AutomationElementCollection FindAll(TreeScope scope, Condition condition) /// currently support or which have null or empty values. Use GetPropertyValue to determine /// whether a property is currently supported and to determine what its current value is. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationProperty [ ] GetSupportedProperties() { CheckElement(); @@ -878,11 +818,6 @@ public AutomationProperty [ ] GetSupportedProperties() /// Get the interfaces that this object supports /// /// An array of AutomationPatterns that represent the supported interfaces - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationPattern [ ] GetSupportedPatterns() { CheckElement(); @@ -903,11 +838,6 @@ public AutomationPattern [ ] GetSupportedPatterns() /// /// Request to set focus to this element /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void SetFocus() { CheckElement(); @@ -929,11 +859,6 @@ public void SetFocus() /// /// A point that can be used ba a client to click on this LogicalElement /// true if there is point that is clickable - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool TryGetClickablePoint( out Point pt ) { // initialize point here so if we return false its initialized @@ -983,11 +908,6 @@ public bool TryGetClickablePoint( out Point pt ) /// /// A point that can be used by a client to click on this LogicalElement /// If there is not clickable point for this element - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public Point GetClickablePoint() { Point pt; @@ -1011,11 +931,6 @@ public Point GetClickablePoint() /// Get root element for current desktop /// /// root element for current desktop - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static AutomationElement RootElement { get @@ -1035,11 +950,6 @@ public static AutomationElement RootElement /// /// Return the currently focused element /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public static AutomationElement FocusedElement { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/DockPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/DockPattern.cs index 058ef2b24fe..3ee347226e5 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/DockPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/DockPattern.cs @@ -65,11 +65,6 @@ private DockPattern(AutomationElement el, SafePatternHandle hPattern, bool cache /// /// Moves the window to be docked at the requested location. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void SetDockPosition( DockPosition dockPosition ) { UiaCoreApi.DockPattern_SetDockPosition(_hPattern, dockPosition); @@ -200,11 +195,6 @@ internal DockPatternInformation(AutomationElement el, bool useCache) #region Public Properties /// Returns whether the DockPosition is Top, Left, Bottom, Right, Fill, or None. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public DockPosition DockPosition { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ExpandCollapsePattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ExpandCollapsePattern.cs index 5c33f8e1c04..1e0dd2b7039 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ExpandCollapsePattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ExpandCollapsePattern.cs @@ -63,11 +63,6 @@ private ExpandCollapsePattern(AutomationElement el, SafePatternHandle hPattern, /// /// Blocking method that returns after the element has been expanded /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Expand() { UiaCoreApi.ExpandCollapsePattern_Expand(_hPattern); @@ -76,11 +71,6 @@ public void Expand() /// /// Blocking method that returns after the element has been collapsed /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Collapse() { UiaCoreApi.ExpandCollapsePattern_Collapse(_hPattern); @@ -220,11 +210,6 @@ internal ExpandCollapsePatternInformation( AutomationElement el, bool useCache ) #region Public Properties ///indicates an element's current Collapsed or Expanded state - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public ExpandCollapseState ExpandCollapseState { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/GridItemPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/GridItemPattern.cs index b1f3f215671..ec6c25af7db 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/GridItemPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/GridItemPattern.cs @@ -213,11 +213,6 @@ internal GridItemPatternInformation(AutomationElement el, bool useCache) /// /// the row number of the element. This is zero based. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int Row { get @@ -229,11 +224,6 @@ public int Row /// /// the column number of the element. This is zero based. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int Column { get @@ -246,11 +236,6 @@ public int Column /// count of how many rows the element spans /// -- non merged cells should always return 1 /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int RowSpan { get @@ -263,11 +248,6 @@ public int RowSpan /// count of how many columns the element spans /// -- non merged cells should always return 1 /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int ColumnSpan { get @@ -279,11 +259,6 @@ public int ColumnSpan /// /// The logical element that supports the GripPattern for this Item /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement ContainingGrid { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/GridPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/GridPattern.cs index 6833926b589..3f9741cab1c 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/GridPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/GridPattern.cs @@ -68,11 +68,6 @@ internal GridPattern(AutomationElement el, SafePatternHandle hPattern, bool cach /// /// Row of item to get /// Column of item to get - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement GetItem(int row, int column) { SafeNodeHandle hNode = UiaCoreApi.GridPattern_GetItem(_hPattern, row, column); @@ -214,11 +209,6 @@ internal GridPatternInformation(AutomationElement el, bool useCache) /// /// number of rows in the grid /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int RowCount { get @@ -230,11 +220,6 @@ public int RowCount /// /// number of columns in the grid /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int ColumnCount { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/InvokePattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/InvokePattern.cs index fcf2b00ec39..0fee765f0fd 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/InvokePattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/InvokePattern.cs @@ -74,11 +74,6 @@ private InvokePattern(AutomationElement el, SafePatternHandle hPattern) /// There is no way to determine what happened, when it happend, or whether /// anything happened at all. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Invoke() { UiaCoreApi.InvokePattern_Invoke(_hPattern); diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/MultipleViewPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/MultipleViewPattern.cs index a8d6197d63b..2e95afd4081 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/MultipleViewPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/MultipleViewPattern.cs @@ -71,11 +71,6 @@ private MultipleViewPattern(AutomationElement el, SafePatternHandle hPattern, bo /// be the same across instances. /// /// Return a localized, human readable string in the application's current UI language. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public string GetViewName( int viewId ) { return UiaCoreApi.MultipleViewPattern_GetViewName(_hPattern, viewId); @@ -84,11 +79,6 @@ public string GetViewName( int viewId ) /// /// Change the current view using an ID returned from GetSupportedViews() /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void SetCurrentView( int viewId ) { UiaCoreApi.MultipleViewPattern_SetCurrentView(_hPattern, viewId); @@ -226,11 +216,6 @@ internal MultipleViewPatternInformation(AutomationElement el, bool useCache) #region Public Properties /// The view ID corresponding to the control's current state. This ID is control-specific - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int CurrentView { get @@ -240,11 +225,6 @@ public int CurrentView } /// Returns an array of ints representing the full set of views available in this control. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int [] GetSupportedViews() { return (int [])_el.GetPatternPropertyValue(SupportedViewsProperty, _useCache); diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/RangeValuePattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/RangeValuePattern.cs index 745899e18a3..84a5e02754f 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/RangeValuePattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/RangeValuePattern.cs @@ -85,11 +85,6 @@ private RangeValuePattern( AutomationElement el, SafePatternHandle hPattern, boo /// Request to set the value that this UI element is representing /// /// Value to set the UI to, as a double - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void SetValue(double value) { // Test the Enabled state prior to the more general Read-Only state. @@ -241,11 +236,6 @@ internal RangeValuePatternInformation(AutomationElement el, bool useCache) #region Public Properties ///Value of a value control - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double Value { get @@ -276,11 +266,6 @@ public double Value ///Indicates that the value can only be read, not modified. ///returns True if the control is read-only - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool IsReadOnly { get @@ -290,11 +275,6 @@ public bool IsReadOnly } ///maximum value - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double Maximum { get @@ -324,11 +304,6 @@ public double Maximum } ///minimum value - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double Minimum { get @@ -362,11 +337,6 @@ public double Minimum /// Gets a value to be added to or subtracted from the Value property /// when the element is moved a large distance. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double LargeChange { get @@ -399,11 +369,6 @@ public double LargeChange /// Gets a value to be added to or subtracted from the Value property /// when the element is moved a small distance. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double SmallChange { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ScrollPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ScrollPattern.cs index 498197c8dc6..3ea3c16c3a9 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ScrollPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ScrollPattern.cs @@ -87,11 +87,6 @@ private ScrollPattern(AutomationElement el, SafePatternHandle hPattern, bool cac /// vertically provides simple panning support. /// Amount to scroll by horizontally /// Amount to scroll by vertically - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void SetScrollPercent( double horizontalPercent, double verticalPercent ) { UiaCoreApi.ScrollPattern_SetScrollPercent(_hPattern, horizontalPercent, verticalPercent); @@ -105,11 +100,6 @@ public void SetScrollPercent( double horizontalPercent, double verticalPercent ) /// /// amount to scroll by horizontally /// amount to scroll by vertically - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Scroll( ScrollAmount horizontalAmount, ScrollAmount verticalAmount ) { UiaCoreApi.ScrollPattern_Scroll(_hPattern, horizontalAmount, verticalAmount); @@ -119,11 +109,6 @@ public void Scroll( ScrollAmount horizontalAmount, ScrollAmount verticalAmount ) /// Request to scroll horizontally by the specified amount /// /// Amount to scroll by - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void ScrollHorizontal( ScrollAmount amount ) { UiaCoreApi.ScrollPattern_Scroll(_hPattern, amount, ScrollAmount.NoAmount); @@ -133,11 +118,6 @@ public void ScrollHorizontal( ScrollAmount amount ) /// Request to scroll vertically by the specified amount /// /// Amount to scroll by - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void ScrollVertical( ScrollAmount amount ) { UiaCoreApi.ScrollPattern_Scroll(_hPattern, ScrollAmount.NoAmount, amount); @@ -278,11 +258,6 @@ internal ScrollPatternInformation(AutomationElement el, bool useCache) /// /// Get the current horizontal scroll position /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double HorizontalScrollPercent { get @@ -294,11 +269,6 @@ public double HorizontalScrollPercent /// /// Get the current vertical scroll position /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double VerticalScrollPercent { get @@ -310,11 +280,6 @@ public double VerticalScrollPercent /// /// Equal to the horizontal percentage of the entire control that is currently viewable. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double HorizontalViewSize { get @@ -326,11 +291,6 @@ public double HorizontalViewSize /// /// Equal to the horizontal percentage of the entire control that is currently viewable. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public double VerticalViewSize { get @@ -342,11 +302,6 @@ public double VerticalViewSize /// /// True if control can scroll horizontally /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool HorizontallyScrollable { get @@ -358,11 +313,6 @@ public bool HorizontallyScrollable /// /// True if control can scroll vertically /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool VerticallyScrollable { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/SelectionItemPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/SelectionItemPattern.cs index d77abe3c670..e620ea87ac3 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/SelectionItemPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/SelectionItemPattern.cs @@ -86,11 +86,6 @@ private SelectionItemPattern(AutomationElement el, SafePatternHandle hPattern, b /// Sets the current element as the selection /// This clears the selection from other elements in the container /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Select() { UiaCoreApi.SelectionItemPattern_Select(_hPattern); @@ -98,11 +93,6 @@ public void Select() /// /// Adds current element to selection /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void AddToSelection() { UiaCoreApi.SelectionItemPattern_AddToSelection(_hPattern); @@ -111,11 +101,6 @@ public void AddToSelection() /// /// Removes current element from selection /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void RemoveFromSelection() { UiaCoreApi.SelectionItemPattern_RemoveFromSelection(_hPattern); @@ -258,11 +243,6 @@ internal SelectionItemPatternInformation(AutomationElement el, bool useCache) /// Check whether an element is selected /// /// returns true if the element is selected - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool IsSelected { get @@ -275,11 +255,6 @@ public bool IsSelected /// The logical element that supports the SelectionPattern for this Item /// /// returns an AutomationElement - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement SelectionContainer { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/SelectionPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/SelectionPattern.cs index aca7299040c..28f5477b5bb 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/SelectionPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/SelectionPattern.cs @@ -215,11 +215,6 @@ internal SelectionPatternInformation(AutomationElement el, bool useCache) /// Get the currently selected elements /// /// An AutomationElement array containing the currently selected elements - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement[] GetSelection() { return (AutomationElement[])_el.GetPatternPropertyValue(SelectionProperty, _useCache); @@ -240,11 +235,6 @@ public AutomationElement[] GetSelection() /// /// Boolean indicating whether the control allows more than one element to be selected /// If this is false, then the control is a single-select ccntrol - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool CanSelectMultiple { get @@ -258,11 +248,6 @@ public bool CanSelectMultiple /// /// Boolean indicating whether the control requires at least one element to be selected /// If this is false, then the control allows all elements to be unselected - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool IsSelectionRequired { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TableItemPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TableItemPattern.cs index b6f30f75418..587b4c45ecd 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TableItemPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TableItemPattern.cs @@ -201,11 +201,6 @@ internal TableItemPatternInformation(AutomationElement el, bool useCache) /// /// the row number of the element. This is zero based. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int Row { get @@ -217,11 +212,6 @@ public int Row /// /// the column number of the element. This is zero based. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int Column { get @@ -234,11 +224,6 @@ public int Column /// count of how many rows the element spans /// -- non merged cells should always return 1 /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int RowSpan { get @@ -251,11 +236,6 @@ public int RowSpan /// count of how many columns the element spans /// -- non merged cells should always return 1 /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int ColumnSpan { get @@ -267,11 +247,6 @@ public int ColumnSpan /// /// The logical element that supports the GripPattern for this Item /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement ContainingGrid { get @@ -281,22 +256,12 @@ public AutomationElement ContainingGrid } /// Collection of all row headers for this cell - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement[] GetRowHeaderItems() { return (AutomationElement[])_el.GetPatternPropertyValue(RowHeaderItemsProperty, _useCache); } /// Collection of all column headers for this cell - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement[] GetColumnHeaderItems() { return (AutomationElement[])_el.GetPatternPropertyValue(ColumnHeaderItemsProperty, _useCache); diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TablePattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TablePattern.cs index 658e1dac9d9..48688624335 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TablePattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TablePattern.cs @@ -189,22 +189,12 @@ internal TablePatternInformation(AutomationElement el, bool useCache) #region Public Properties /// Collection of all row headers for this table - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement[] GetRowHeaders() { return (AutomationElement[])_el.GetPatternPropertyValue(RowHeadersProperty, _useCache); } /// Collection of all column headers for this table - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public AutomationElement[] GetColumnHeaders() { return (AutomationElement[])_el.GetPatternPropertyValue(ColumnHeadersProperty, _useCache); @@ -213,11 +203,6 @@ public AutomationElement[] GetColumnHeaders() /// /// number of rows in the grid /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int RowCount { get @@ -229,11 +214,6 @@ public int RowCount /// /// number of columns in the grid /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public int ColumnCount { get @@ -243,11 +223,6 @@ public int ColumnCount } /// Indicates if the data is best presented by row or column - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public RowOrColumnMajor RowOrColumnMajor { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TogglePattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TogglePattern.cs index 8de35ef96ce..279a445e3c1 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TogglePattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TogglePattern.cs @@ -65,11 +65,6 @@ private TogglePattern(AutomationElement el, SafePatternHandle hPattern, bool cac /// /// Request to change the state that this UI element is currently representing /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Toggle() { UiaCoreApi.TogglePattern_Toggle(_hPattern); @@ -209,11 +204,6 @@ internal TogglePatternInformation(AutomationElement el, bool useCache) #region Public Properties /// Value of a toggleable control, as a ToggleState enum - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public ToggleState ToggleState { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TransformPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TransformPattern.cs index 41ec0d96499..d3e2ebd741d 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TransformPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/TransformPattern.cs @@ -75,11 +75,6 @@ private TransformPattern(AutomationElement el, SafePatternHandle hPattern, bool /// /// absolute on-screen position of the top left corner /// absolute on-screen position of the top left corner - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Move( double x, double y ) { UiaCoreApi.TransformPattern_Move(_hPattern, x, y); @@ -93,10 +88,6 @@ public void Move( double x, double y ) /// /// The requested width of the window. /// The requested height of the window. - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Resize( double width, double height ) { UiaCoreApi.TransformPattern_Resize(_hPattern, width, height); @@ -107,10 +98,6 @@ public void Resize( double width, double height ) /// /// The requested degrees to rotate the element. A positive number rotates clockwise /// a negative number rotates counter clockwise - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Rotate( double degrees ) { UiaCoreApi.TransformPattern_Rotate(_hPattern, degrees); @@ -251,11 +238,6 @@ internal TransformPatternInformation(AutomationElement el, bool useCache) #region Public Properties /// Returns true if the element can be moved otherwise returns false. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool CanMove { get @@ -265,11 +247,6 @@ public bool CanMove } /// Returns true if the element can be resized otherwise returns false. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool CanResize { get @@ -279,11 +256,6 @@ public bool CanResize } /// Returns true if the element can be rotated otherwise returns false. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool CanRotate { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ValuePattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ValuePattern.cs index e38ade436a7..39090b33724 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ValuePattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/ValuePattern.cs @@ -70,11 +70,6 @@ internal ValuePattern(AutomationElement el, SafePatternHandle hPattern, bool cac /// Request to set the value that this UI element is representing /// /// Value to set the UI to, the provider is responsible for converting from a string into the appropriate data type - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void SetValue( string value ) { Misc.ValidateArgumentNonNull(value, "value"); @@ -231,11 +226,6 @@ internal ValuePatternInformation(AutomationElement el, bool useCache) #region Public Properties ///Value of a value control, as a a string. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public string Value { get @@ -251,11 +241,6 @@ public string Value ///Indicates that the value can only be read, not modified. ///returns True if the control is read-only - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool IsReadOnly { get diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs index 5d42556a85d..e58940e319f 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/System/Windows/Automation/WindowPattern.cs @@ -90,11 +90,6 @@ private WindowPattern(AutomationElement el, SafePatternHandle hPattern, bool cac /// Changes the State of the window based on the passed enum. /// /// The requested state of the window. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void SetWindowVisualState( WindowVisualState state ) { UiaCoreApi.WindowPattern_SetWindowVisualState(_hPattern, state); @@ -106,11 +101,6 @@ public void SetWindowVisualState( WindowVisualState state ) /// split), it may or may not also close all other panes related to the /// document/content/etc. This behavior is application dependent. /// - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public void Close() { UiaCoreApi.WindowPattern_Close(_hPattern); @@ -276,11 +266,6 @@ internal WindowPatternInformation(AutomationElement el, bool useCache) #region Public Properties /// Is this window Maximizable - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool CanMaximize { get @@ -290,11 +275,6 @@ public bool CanMaximize } /// Is this window Minimizable - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool CanMinimize { get @@ -304,11 +284,6 @@ public bool CanMinimize } /// Is this is a modal window. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool IsModal { get @@ -318,11 +293,6 @@ public bool IsModal } /// Is the Window Maximized, Minimized, or Normal (aka restored) - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public WindowVisualState WindowVisualState { get @@ -332,11 +302,6 @@ public WindowVisualState WindowVisualState } /// Is the Window Closing, ReadyForUserInteraction, BlockedByModalWindow or NotResponding. - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public WindowInteractionState WindowInteractionState { get @@ -346,11 +311,6 @@ public WindowInteractionState WindowInteractionState } /// Is this window is always on top - /// - /// - /// This API does not work inside the secure execution environment. - /// - /// public bool IsTopmost { get diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Interop/ComponentDispatcher.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Interop/ComponentDispatcher.cs index c68053bbe91..3eac991fc67 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Interop/ComponentDispatcher.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Interop/ComponentDispatcher.cs @@ -61,9 +61,6 @@ private static ComponentDispatcherThread CurrentThreadData /// Returns true if one or more components has gone modal. /// Although once one component is modal a 2nd shouldn't. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static bool IsThreadModal { get @@ -76,9 +73,6 @@ public static bool IsThreadModal /// /// Returns "current" message. More exactly the last MSG Raised. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static MSG CurrentKeyboardMessage { get @@ -110,9 +104,6 @@ internal static MSG UnsecureCurrentKeyboardMessage /// /// A component calls this to go modal. Current thread wide only. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static void PushModal() { CriticalPushModal(); @@ -130,9 +121,6 @@ internal static void CriticalPushModal() /// /// A component calls this to end being modal. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static void PopModal() { CriticalPopModal(); @@ -150,9 +138,6 @@ internal static void CriticalPopModal() /// /// The message loop pumper calls this when it is time to do idle processing. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// [SuppressMessage("Microsoft.Design", "CA1030:UseEventsWhereAppropriate")] public static void RaiseIdle() { @@ -163,9 +148,6 @@ public static void RaiseIdle() /// /// The message loop pumper calls this for every keyboard message. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// [SuppressMessage("Microsoft.Design", "CA1030:UseEventsWhereAppropriate")] [SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference")] public static bool RaiseThreadMessage(ref MSG msg) @@ -180,9 +162,6 @@ public static bool RaiseThreadMessage(ref MSG msg) /// Components register delegates with this event to handle /// thread idle processing. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static event EventHandler ThreadIdle { add { @@ -197,9 +176,6 @@ public static event EventHandler ThreadIdle /// Components register delegates with this event to handle /// Keyboard Messages (first chance processing). /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// [SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly")] public static event ThreadMessageEventHandler ThreadFilterMessage { @@ -215,9 +191,6 @@ public static event ThreadMessageEventHandler ThreadFilterMessage /// Components register delegates with this event to handle /// Keyboard Messages (second chance processing). /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// [SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly")] public static event ThreadMessageEventHandler ThreadPreprocessMessage { @@ -252,9 +225,6 @@ internal static void CriticalRemoveThreadPreprocessMessageHandlerFirst(ThreadMes /// Components register delegates with this event to handle /// a component on this thread has "gone modal", when previously none were. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static event EventHandler EnterThreadModal { add { @@ -269,9 +239,6 @@ public static event EventHandler EnterThreadModal /// Components register delegates with this event to handle /// all components on this thread are done being modal. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static event EventHandler LeaveThreadModal { add diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs index d61a4514445..b494828f349 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs @@ -243,9 +243,6 @@ public void BeginInvokeShutdown(DispatcherPriority priority) // NOTE: should be /// /// Begins the process of shutting down the dispatcher. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public void InvokeShutdown() { @@ -295,7 +292,6 @@ public bool HasShutdownFinished /// /// /// This frame will continue until the dispatcher is shut down. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// public static void Run() { @@ -308,9 +304,6 @@ public static void Run() /// /// The frame for the dispatcher to process. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static void PushFrame(DispatcherFrame frame) { if(frame == null) @@ -340,9 +333,6 @@ public static void PushFrame(DispatcherFrame frame) /// /// Requests that all nested frames exit. /// - /// - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. - /// public static void ExitAllFrames() { @@ -1598,7 +1588,6 @@ public static void ValidatePriority(DispatcherPriority priority, string paramete ///

/// This method is public so that any thread can probe to /// see if it has access to the DispatcherObject. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// /// /// True if the calling thread has access to this object. @@ -1637,7 +1626,6 @@ public DispatcherHooks Hooks /// creating secondary exceptions and to catch any that occur. /// It is recommended to avoid allocating memory or doing any /// heavylifting if possible. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// public event DispatcherUnhandledExceptionFilterEventHandler UnhandledExceptionFilter { @@ -1849,11 +1837,6 @@ private void StartShutdownImpl() // Because we may have to defer the actual shutting-down until // later, we need to remember the execution context we started // the shutdown from. - // - // Note that we demanded permissions when BeginInvokeShutdown - // or InvokeShutdown were called. So if there were not enough - // permissions, we would have thrown then. - // CulturePreservingExecutionContext shutdownExecutionContext = CulturePreservingExecutionContext.Capture(); _shutdownExecutionContext = new SecurityCriticalDataClass(shutdownExecutionContext); diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/DispatcherHooks.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/DispatcherHooks.cs index 000230c5ec1..27d4aa1cd17 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/DispatcherHooks.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/DispatcherHooks.cs @@ -20,7 +20,6 @@ public sealed class DispatcherHooks ///

/// Note also that this event could come before the last operation is /// invoked, because that is when we determine that the queue is empty. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// public event EventHandler DispatcherInactive { @@ -51,7 +50,6 @@ public event EventHandler DispatcherInactive ///

/// Note that any thread can post operations, so this event can be /// raised by any thread. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// public event DispatcherHookEventHandler OperationPosted { @@ -82,7 +80,6 @@ public event DispatcherHookEventHandler OperationPosted ///

/// Note that any thread can post operations, so this event can be /// raised by any thread. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// public event DispatcherHookEventHandler OperationStarted { @@ -113,7 +110,6 @@ public event DispatcherHookEventHandler OperationStarted /// /// Note that this event will be raised by the dispatcher thread after /// the operation has completed. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// public event DispatcherHookEventHandler OperationCompleted { @@ -139,7 +135,6 @@ public event DispatcherHookEventHandler OperationCompleted /// /// Note that any thread can change the priority of operations, /// so this event can be raised by any thread. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// public event DispatcherHookEventHandler OperationPriorityChanged { @@ -165,7 +160,6 @@ public event DispatcherHookEventHandler OperationPriorityChanged /// /// Note that any thread can abort an operation, so this event /// can be raised by any thread. - /// Callers must have UIPermission(PermissionState.Unrestricted) to call this API. /// public event DispatcherHookEventHandler OperationAborted { From 81f2a0e8b130c7c1522c0812a0c0cbe2f0d618d0 Mon Sep 17 00:00:00 2001 From: Youssef1313 <31348972+Youssef1313@users.noreply.github.com> Date: Wed, 17 Jul 2019 00:31:04 +0200 Subject: [PATCH 116/227] Use nameof instead of magic string (#1177) * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Reverting wrong change * Use nameof instead of magic string * Use nameof instead of magic string * Use nameof instead of magic string * Update DependencyPropertyDescriptor.cs --- .../MS/Internal/Tasks/TaskFileService.cs | 16 +++++----- .../Windows/Media/Animation/TimelineGroup.cs | 6 ++-- .../System/Windows/Media/VisualCollection.cs | 26 +++++++-------- .../Annotations/Anchoring/SubtreeProcessor.cs | 4 +-- .../MS/Internal/documents/UndoManager.cs | 20 ++++++------ .../System/Windows/Condition.cs | 24 +++++++------- .../System/Windows/Controls/Canvas.cs | 16 +++++----- .../Data/XmlNamespaceMappingCollection.cs | 18 +++++------ .../SemanticBasicElement.cs | 26 +++++++-------- .../Windows/Markup/Baml2006/SharedStream.cs | 28 ++++++++-------- .../System/Windows/Markup/XamlReader.cs | 26 +++++++-------- .../ReachFramework/PrintConfig/PTConverter.cs | 20 ++++++------ .../ObjectModel/WeakReadOnlyCollection.cs | 8 ++--- .../DependencyPropertyDescriptor.cs | 32 +++++++++---------- 14 files changed, 135 insertions(+), 135 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskFileService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskFileService.cs index 48b3288c583..6bf2edd2637 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskFileService.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskFileService.cs @@ -125,7 +125,7 @@ public Stream GetContent(string srcFile) if (String.IsNullOrEmpty(srcFile)) { - throw new ArgumentNullException("srcFile"); + throw new ArgumentNullException(nameof(srcFile)); } if (HostFileManager != null) @@ -217,7 +217,7 @@ public DateTime GetLastChangeTime(string srcFile) if (String.IsNullOrEmpty(srcFile)) { - throw new ArgumentNullException("srcFile"); + throw new ArgumentNullException(nameof(srcFile)); } if (IsFileInHostManager(srcFile)) @@ -243,7 +243,7 @@ public bool Exists(string fileName) if (fileName == null) { - throw new ArgumentNullException("fileName"); + throw new ArgumentNullException(nameof(fileName)); } if (HostFileManager != null) @@ -265,7 +265,7 @@ public void Delete(string fileName) { if (fileName == null) { - throw new ArgumentNullException("fileName"); + throw new ArgumentNullException(nameof(fileName)); } if (IsFileInHostManager(fileName)) @@ -287,12 +287,12 @@ public void WriteFile(byte[] contentArray, string destinationFile) { if (String.IsNullOrEmpty(destinationFile)) { - throw new ArgumentNullException("destinationFile"); + throw new ArgumentNullException(nameof(destinationFile)); } if (contentArray == null) { - throw new ArgumentNullException("contentArray"); + throw new ArgumentNullException(nameof(contentArray)); } UTF8Encoding utf8Encoding = new UTF8Encoding(); @@ -331,12 +331,12 @@ public void WriteGeneratedCodeFile(byte[] contentArray, string destinationFileBa { if (String.IsNullOrEmpty(destinationFileBaseName)) { - throw new ArgumentNullException("destinationFileBaseName"); + throw new ArgumentNullException(nameof(destinationFileBaseName)); } if (contentArray == null) { - throw new ArgumentNullException("contentArray"); + throw new ArgumentNullException(nameof(contentArray)); } string buildFile = destinationFileBaseName + generatedExtension + languageSourceExtension; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineGroup.cs index c0f2d4cdc0e..d9e34cec639 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineGroup.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineGroup.cs @@ -115,7 +115,7 @@ void IAddChild.AddChild(object child) if (child == null) { - throw new ArgumentNullException("child"); + throw new ArgumentNullException(nameof(child)); } AddChild(child); @@ -153,7 +153,7 @@ protected virtual void AddChild(object child) if (timelineChild == null) { - throw new ArgumentException(SR.Get(SRID.Timing_ChildMustBeTimeline), "child"); + throw new ArgumentException(SR.Get(SRID.Timing_ChildMustBeTimeline), nameof(child)); } else { @@ -180,7 +180,7 @@ void IAddChild.AddText(string childText) if (childText == null) { - throw new ArgumentNullException("childText"); + throw new ArgumentNullException(nameof(childText)); } AddText(childText); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualCollection.cs index cc52065f669..ed51b482335 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualCollection.cs @@ -84,7 +84,7 @@ public VisualCollection(Visual parent) { if (parent == null) { - throw new ArgumentNullException("parent"); + throw new ArgumentNullException(nameof(parent)); } _owner = parent; } @@ -193,7 +193,7 @@ public void CopyTo(Array array, int index) if (array == null) { - throw new ArgumentNullException("array"); + throw new ArgumentNullException(nameof(array)); } if (array.Rank != 1) @@ -204,7 +204,7 @@ public void CopyTo(Array array, int index) if ((index < 0) || (array.Length - index < _size)) { - throw new ArgumentOutOfRangeException("index"); + throw new ArgumentOutOfRangeException(nameof(index)); } // System.Array does not have a CopyTo method that takes a count. Therefore @@ -227,13 +227,13 @@ public void CopyTo(Visual[] array, int index) if (array == null) { - throw new ArgumentNullException("array"); + throw new ArgumentNullException(nameof(array)); } if ((index < 0) || (array.Length - index < _size)) { - throw new ArgumentOutOfRangeException("index"); + throw new ArgumentOutOfRangeException(nameof(index)); } // System.Array does not have a CopyTo method that takes a count. Therefore @@ -279,7 +279,7 @@ internal int InternalCapacity { if (value < _size) { - throw new ArgumentOutOfRangeException("value", SR.Get(SRID.VisualCollection_NotEnoughCapacity)); + throw new ArgumentOutOfRangeException(nameof(value), SR.Get(SRID.VisualCollection_NotEnoughCapacity)); } if (value > 0) { @@ -353,7 +353,7 @@ public Visual this[int index] // get methods #pragma warning disable 6503 - if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException("index"); + if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException(nameof(index)); return _items[index]; #pragma warning restore 6503 } @@ -361,7 +361,7 @@ public Visual this[int index] { VerifyAPIReadWrite(value); - if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException("index"); + if (index < 0 || index >= _size) throw new ArgumentOutOfRangeException(nameof(index)); Visual child = _items[index]; @@ -721,7 +721,7 @@ public void Insert(int index, Visual visual) if (index < 0 || index > _size) { - throw new ArgumentOutOfRangeException("index"); + throw new ArgumentOutOfRangeException(nameof(index)); } if ((visual != null) && @@ -773,7 +773,7 @@ public void RemoveAt(int index) if (index < 0 || index >= _size) { - throw new ArgumentOutOfRangeException("index"); + throw new ArgumentOutOfRangeException(nameof(index)); } InternalRemove(_items[index]); @@ -806,15 +806,15 @@ public void RemoveRange(int index, int count) // Do we really need this extra check index >= _size. if (index < 0) { - throw new ArgumentOutOfRangeException("index"); + throw new ArgumentOutOfRangeException(nameof(index)); } if (count < 0) { - throw new ArgumentOutOfRangeException("count"); + throw new ArgumentOutOfRangeException(nameof(count)); } if (_size - index < count) { - throw new ArgumentOutOfRangeException("index"); + throw new ArgumentOutOfRangeException(nameof(index)); } if (count > 0) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/SubtreeProcessor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/SubtreeProcessor.cs index ea79e49dc1a..fb72119d664 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/SubtreeProcessor.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Anchoring/SubtreeProcessor.cs @@ -50,7 +50,7 @@ internal abstract class SubTreeProcessor protected SubTreeProcessor(LocatorManager manager) { if (manager == null) - throw new ArgumentNullException("manager"); + throw new ArgumentNullException(nameof(manager)); _manager = manager; } @@ -96,7 +96,7 @@ protected SubTreeProcessor(LocatorManager manager) public virtual IList PostProcessNode(DependencyObject node, bool childrenCalledProcessAnnotations, out bool calledProcessAnnotations) { if (node == null) - throw new ArgumentNullException("node"); + throw new ArgumentNullException(nameof(node)); calledProcessAnnotations = false; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/UndoManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/UndoManager.cs index c19e596affb..84eca5d704f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/UndoManager.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/UndoManager.cs @@ -104,12 +104,12 @@ internal static void AttachUndoManager(DependencyObject scope, UndoManager undoM { if (scope == null) { - throw new ArgumentNullException("scope"); + throw new ArgumentNullException(nameof(scope)); } if (undoManager == null) { - throw new ArgumentNullException("undoManager"); + throw new ArgumentNullException(nameof(undoManager)); } if (undoManager is UndoManager && ((UndoManager)undoManager)._scope != null) @@ -146,7 +146,7 @@ internal static void DetachUndoManager(DependencyObject scope) if (scope == null) { - throw new ArgumentNullException("scope"); + throw new ArgumentNullException(nameof(scope)); } // Detach existing undo service if any @@ -212,7 +212,7 @@ internal void Open(IParentUndoUnit unit) if (unit == null) { - throw new ArgumentNullException("unit"); + throw new ArgumentNullException(nameof(unit)); } deepestOpen = DeepestOpenUnit; @@ -264,7 +264,7 @@ internal void Reopen(IParentUndoUnit unit) if (unit == null) { - throw new ArgumentNullException("unit"); + throw new ArgumentNullException(nameof(unit)); } if (OpenedUnit != null) @@ -343,7 +343,7 @@ internal void Close(IParentUndoUnit unit, UndoCloseAction closeAction) if (unit == null) { - throw new ArgumentNullException("unit"); + throw new ArgumentNullException(nameof(unit)); } if (OpenedUnit == null) @@ -365,7 +365,7 @@ internal void Close(IParentUndoUnit unit, UndoCloseAction closeAction) if (closeParent.OpenedUnit == null) { - throw new ArgumentException(SR.Get(SRID.UndoUnitNotFound), "unit"); + throw new ArgumentException(SR.Get(SRID.UndoUnitNotFound), nameof(unit)); } closeParent.Close(closeAction); @@ -439,7 +439,7 @@ internal void Add(IUndoUnit unit) if (unit == null) { - throw new ArgumentNullException("unit"); + throw new ArgumentNullException(nameof(unit)); } parent = DeepestOpenUnit; @@ -540,7 +540,7 @@ internal void Undo(int count) if (count > UndoCount || count <= 0) { - throw new ArgumentOutOfRangeException("count"); + throw new ArgumentOutOfRangeException(nameof(count)); } if (State != UndoState.Normal) @@ -607,7 +607,7 @@ internal void Redo(int count) if (count > RedoStack.Count || count <= 0) { - throw new ArgumentOutOfRangeException("count"); + throw new ArgumentOutOfRangeException(nameof(count)); } if (State != UndoState.Normal) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Condition.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Condition.cs index 4a322a6931f..73371a4cebd 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Condition.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Condition.cs @@ -50,12 +50,12 @@ public Condition( DependencyProperty conditionProperty, object conditionValue ) /// public Condition( DependencyProperty conditionProperty, object conditionValue, string sourceName ) { - if( conditionProperty == null ) + if(conditionProperty == null) { - throw new ArgumentNullException("conditionProperty"); + throw new ArgumentNullException(nameof(conditionProperty)); } - if( !conditionProperty.IsValidValue( conditionValue ) ) + if(!conditionProperty.IsValidValue(conditionValue)) { throw new ArgumentException(SR.Get(SRID.InvalidPropertyValue, conditionValue, conditionProperty.Name)); } @@ -71,9 +71,9 @@ public Condition( DependencyProperty conditionProperty, object conditionValue, s /// public Condition( BindingBase binding, object conditionValue ) { - if( binding == null ) + if(binding == null) { - throw new ArgumentNullException("binding"); + throw new ArgumentNullException(nameof(binding)); } Binding = binding; @@ -118,7 +118,7 @@ public BindingBase Binding throw new InvalidOperationException(SR.Get(SRID.CannotChangeAfterSealed, "Condition")); } - if( _property != null ) + if(_property != null) { throw new InvalidOperationException(SR.Get(SRID.ConditionCannotUseBothPropertyAndBinding)); } @@ -147,7 +147,7 @@ public object Value value.GetType().Name)); } - if( value is Expression ) + if(value is Expression) { throw new ArgumentException(SR.Get(SRID.ConditionValueOfExpressionNotSupported)); } @@ -171,7 +171,7 @@ public string SourceName } set { - if( _sealed ) + if(_sealed) { throw new InvalidOperationException(SR.Get(SRID.CannotChangeAfterSealed, "Condition")); } @@ -271,11 +271,11 @@ public static void ReceiveMarkupExtension(object targetObject, XamlSetMarkupExte { if (targetObject == null) { - throw new ArgumentNullException("targetObject"); + throw new ArgumentNullException(nameof(targetObject)); } if (eventArgs == null) { - throw new ArgumentNullException("eventArgs"); + throw new ArgumentNullException(nameof(eventArgs)); } Condition condition = targetObject as Condition; @@ -292,11 +292,11 @@ public static void ReceiveTypeConverter(object targetObject, XamlSetTypeConverte Condition condition = targetObject as Condition; if (condition == null) { - throw new ArgumentNullException("targetObject"); + throw new ArgumentNullException(nameof(targetObject)); } if (eventArgs == null) { - throw new ArgumentNullException("eventArgs"); + throw new ArgumentNullException(nameof(eventArgs)); } if (eventArgs.Member.Name == "Property") diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Canvas.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Canvas.cs index 44b18d2b3d3..5f64b580c68 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Canvas.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Canvas.cs @@ -81,7 +81,7 @@ public Canvas() : base() [AttachedPropertyBrowsableForChildren()] public static double GetLeft(UIElement element) { - if (element == null) { throw new ArgumentNullException("element"); } + if (element == null) { throw new ArgumentNullException(nameof(element)); } return (double)element.GetValue(LeftProperty); } @@ -93,7 +93,7 @@ public static double GetLeft(UIElement element) /// public static void SetLeft(UIElement element, double length) { - if (element == null) { throw new ArgumentNullException("element"); } + if (element == null) { throw new ArgumentNullException(nameof(element)); } element.SetValue(LeftProperty, length); } @@ -107,7 +107,7 @@ public static void SetLeft(UIElement element, double length) [AttachedPropertyBrowsableForChildren()] public static double GetTop(UIElement element) { - if (element == null) { throw new ArgumentNullException("element"); } + if (element == null) { throw new ArgumentNullException(nameof(element)); } return (double)element.GetValue(TopProperty); } @@ -119,7 +119,7 @@ public static double GetTop(UIElement element) /// public static void SetTop(UIElement element, double length) { - if (element == null) { throw new ArgumentNullException("element"); } + if (element == null) { throw new ArgumentNullException(nameof(element)); } element.SetValue(TopProperty, length); } @@ -133,7 +133,7 @@ public static void SetTop(UIElement element, double length) [AttachedPropertyBrowsableForChildren()] public static double GetRight(UIElement element) { - if (element == null) { throw new ArgumentNullException("element"); } + if (element == null) { throw new ArgumentNullException(nameof(element)); } return (double)element.GetValue(RightProperty); } @@ -145,7 +145,7 @@ public static double GetRight(UIElement element) /// public static void SetRight(UIElement element, double length) { - if (element == null) { throw new ArgumentNullException("element"); } + if (element == null) { throw new ArgumentNullException(nameof(element)); } element.SetValue(RightProperty, length); } @@ -159,7 +159,7 @@ public static void SetRight(UIElement element, double length) [AttachedPropertyBrowsableForChildren()] public static double GetBottom(UIElement element) { - if (element == null) { throw new ArgumentNullException("element"); } + if (element == null) { throw new ArgumentNullException(nameof(element)); } return (double)element.GetValue(BottomProperty); } @@ -171,7 +171,7 @@ public static double GetBottom(UIElement element) /// public static void SetBottom(UIElement element, double length) { - if (element == null) { throw new ArgumentNullException("element"); } + if (element == null) { throw new ArgumentNullException(nameof(element)); } element.SetValue(BottomProperty, length); } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/XmlNamespaceMappingCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/XmlNamespaceMappingCollection.cs index 6174f185f4e..f55c3a15384 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/XmlNamespaceMappingCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/XmlNamespaceMappingCollection.cs @@ -72,7 +72,7 @@ void IAddChild.AddText(string text) protected virtual void AddText(string text) { if (text == null) - throw new ArgumentNullException("text"); + throw new ArgumentNullException(nameof(text)); XamlSerializerUtil.ThrowIfNonWhiteSpaceInAddText(text, this); } @@ -88,10 +88,10 @@ protected virtual void AddText(string text) public void Add(XmlNamespaceMapping mapping) { if (mapping == null) - throw new ArgumentNullException("mapping"); + throw new ArgumentNullException(nameof(mapping)); if (mapping.Uri == null) - throw new ArgumentException(SR.Get(SRID.RequiresXmlNamespaceMappingUri), "mapping"); + throw new ArgumentException(SR.Get(SRID.RequiresXmlNamespaceMappingUri), nameof(mapping)); // BUG 983685: change this to take Uri when AddNamespace is fixed to use Uri instead of String. // SECURITY: this workaround (passing the original string) defeats the security benefits of using Uri. @@ -123,10 +123,10 @@ public void Clear() public bool Contains(XmlNamespaceMapping mapping) { if (mapping == null) - throw new ArgumentNullException("mapping"); + throw new ArgumentNullException(nameof(mapping)); if (mapping.Uri == null) - throw new ArgumentException(SR.Get(SRID.RequiresXmlNamespaceMappingUri), "mapping"); + throw new ArgumentException(SR.Get(SRID.RequiresXmlNamespaceMappingUri), nameof(mapping)); return (this.LookupNamespace(mapping.Prefix) == mapping.Uri.OriginalString); } @@ -137,14 +137,14 @@ public bool Contains(XmlNamespaceMapping mapping) public void CopyTo(XmlNamespaceMapping[] array, int arrayIndex) { if (array == null) - throw new ArgumentNullException("array"); + throw new ArgumentNullException(nameof(array)); int i = arrayIndex; int maxLength = array.Length; foreach (XmlNamespaceMapping mapping in this) { if (i >= maxLength) - throw new ArgumentException(SR.Get(SRID.Collection_CopyTo_NumberOfElementsExceedsArrayLength, "arrayIndex", "array")); + throw new ArgumentException(SR.Get(SRID.Collection_CopyTo_NumberOfElementsExceedsArrayLength, nameof(arrayIndex), nameof(array))); array[i] = mapping; ++ i; } @@ -160,10 +160,10 @@ public void CopyTo(XmlNamespaceMapping[] array, int arrayIndex) public bool Remove(XmlNamespaceMapping mapping) { if (mapping == null) - throw new ArgumentNullException("mapping"); + throw new ArgumentNullException(nameof(mapping)); if (mapping.Uri == null) - throw new ArgumentException(SR.Get(SRID.RequiresXmlNamespaceMappingUri), "mapping"); + throw new ArgumentException(SR.Get(SRID.RequiresXmlNamespaceMappingUri), nameof(mapping)); if (Contains(mapping)) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/DocumentStructures/SemanticBasicElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/DocumentStructures/SemanticBasicElement.cs index f4607f446e6..905cc4ef8f4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/DocumentStructures/SemanticBasicElement.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/DocumentStructures/SemanticBasicElement.cs @@ -67,7 +67,7 @@ public void Add(BlockElement element) { if (element == null) { - throw new ArgumentNullException("element"); + throw new ArgumentNullException(nameof(element)); } ((IAddChild) this).AddChild(element); } @@ -116,7 +116,7 @@ public void Add(NamedElement element) { if (element == null) { - throw new ArgumentNullException("element"); + throw new ArgumentNullException(nameof(element)); } ((IAddChild) this).AddChild(element); } @@ -176,7 +176,7 @@ public void Add(NamedElement element) { if (element == null) { - throw new ArgumentNullException("element"); + throw new ArgumentNullException(nameof(element)); } ((IAddChild) this).AddChild(element); } @@ -209,7 +209,7 @@ public void Add(ListItemStructure listItem) { if (listItem == null) { - throw new ArgumentNullException("listItem"); + throw new ArgumentNullException(nameof(listItem)); } ((IAddChild) this).AddChild(listItem); } @@ -222,7 +222,7 @@ void IAddChild.AddChild(object value) return; } - throw new ArgumentException(SR.Get(SRID.UnexpectedParameterType, value.GetType(), typeof(ListItemStructure)), "value"); + throw new ArgumentException(SR.Get(SRID.UnexpectedParameterType, value.GetType(), typeof(ListItemStructure)), nameof(value)); } void IAddChild.AddText(string text) { } @@ -254,7 +254,7 @@ public void Add(BlockElement element) { if (element == null) { - throw new ArgumentNullException("element"); + throw new ArgumentNullException(nameof(element)); } ((IAddChild) this).AddChild(element); } @@ -311,7 +311,7 @@ public void Add(TableRowGroupStructure tableRowGroup) { if (tableRowGroup == null) { - throw new ArgumentNullException("tableRowGroup"); + throw new ArgumentNullException(nameof(tableRowGroup)); } ((IAddChild) this).AddChild(tableRowGroup); } @@ -356,7 +356,7 @@ public void Add(TableRowStructure tableRow) { if (tableRow == null) { - throw new ArgumentNullException("tableRow"); + throw new ArgumentNullException(nameof(tableRow)); } ((IAddChild) this).AddChild(tableRow); } @@ -368,7 +368,7 @@ void IAddChild.AddChild(object value) _elementList.Add((TableRowStructure)value); return; } - throw new ArgumentException(SR.Get(SRID.UnexpectedParameterType, value.GetType(), typeof(TableRowStructure)), "value"); + throw new ArgumentException(SR.Get(SRID.UnexpectedParameterType, value.GetType(), typeof(TableRowStructure)), nameof(value)); } void IAddChild.AddText(string text) { } @@ -402,7 +402,7 @@ public void Add(TableCellStructure tableCell) { if (tableCell == null) { - throw new ArgumentNullException("tableCell"); + throw new ArgumentNullException(nameof(tableCell)); } ((IAddChild) this).AddChild(tableCell); } @@ -414,7 +414,7 @@ void IAddChild.AddChild(object value) _elementList.Add((TableCellStructure)value); return; } - throw new ArgumentException(SR.Get(SRID.UnexpectedParameterType, value.GetType(), typeof(TableCellStructure)), "value"); + throw new ArgumentException(SR.Get(SRID.UnexpectedParameterType, value.GetType(), typeof(TableCellStructure)), nameof(value)); } void IAddChild.AddText(string text) { } @@ -449,7 +449,7 @@ public void Add(BlockElement element) { if (element == null) { - throw new ArgumentNullException("element"); + throw new ArgumentNullException(nameof(element)); } ((IAddChild) this).AddChild(element); } @@ -462,7 +462,7 @@ void IAddChild.AddChild(object value) return; } throw new ArgumentException(SR.Get(SRID.DocumentStructureUnexpectedParameterType4, value.GetType(), - typeof(ParagraphStructure), typeof(TableStructure), typeof(ListStructure), typeof(FigureStructure)), "value"); + typeof(ParagraphStructure), typeof(TableStructure), typeof(ListStructure), typeof(FigureStructure)), nameof(value)); } void IAddChild.AddText(string text) { } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/SharedStream.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/SharedStream.cs index ab9ca967275..2664092c9a2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/SharedStream.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/SharedStream.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; +using System; using System.IO; using System.ComponentModel; @@ -26,7 +26,7 @@ public SharedStream(Stream baseStream) { if (baseStream == null) { - throw new ArgumentNullException("baseStream"); + throw new ArgumentNullException(nameof(baseStream)); } Initialize(baseStream, 0, baseStream.Length); @@ -42,7 +42,7 @@ public SharedStream(Stream baseStream, long offset, long length) { if (baseStream == null) { - throw new ArgumentNullException("baseStream"); + throw new ArgumentNullException(nameof(baseStream)); } Initialize(baseStream, offset, length); @@ -57,12 +57,12 @@ private void Initialize(Stream baseStream, long offset, long length) if (offset < 0) { - throw new ArgumentOutOfRangeException("offset"); + throw new ArgumentOutOfRangeException(nameof(offset)); } if (length < 0) { - throw new ArgumentOutOfRangeException("length"); + throw new ArgumentOutOfRangeException(nameof(length)); } SharedStream subStream = baseStream as SharedStream; @@ -146,7 +146,7 @@ public override long Position { if (value < 0 || value >= _length) { - throw new ArgumentOutOfRangeException("value", value, string.Empty); + throw new ArgumentOutOfRangeException(nameof(value), value, string.Empty); } _position = value; @@ -178,17 +178,17 @@ public override int Read(byte[] buffer, int offset, int count) { if (buffer == null) { - throw new ArgumentNullException("buffer"); + throw new ArgumentNullException(nameof(buffer)); } if (offset < 0 || offset >= buffer.Length) { - throw new ArgumentOutOfRangeException("offset"); + throw new ArgumentOutOfRangeException(nameof(offset)); } if ((offset + count) > buffer.Length) { - throw new ArgumentOutOfRangeException("count"); + throw new ArgumentOutOfRangeException(nameof(count)); } CheckDisposed(); @@ -213,15 +213,15 @@ public override void Write(byte[] buffer, int offset, int count) #else if(buffer == null) { - throw new ArgumentNullException("buffer"); + throw new ArgumentNullException(nameof(buffer)); } if(offset < 0 || offset >= buffer.Length) { - throw new ArgumentOutOfRangeException("offset"); + throw new ArgumentOutOfRangeException(nameof(offset)); } if((offset + count) > buffer.Length) { - throw new ArgumentOutOfRangeException("count"); + throw new ArgumentOutOfRangeException(nameof(count)); } CheckDisposed(); @@ -254,12 +254,12 @@ public override long Seek(long offset, SeekOrigin origin) break; default: - throw new InvalidEnumArgumentException("origin", (int)origin, typeof(SeekOrigin)); + throw new InvalidEnumArgumentException(nameof(origin), (int)origin, typeof(SeekOrigin)); } if (newPosition < 0 || newPosition >= _length) { - throw new ArgumentOutOfRangeException("offset", offset, string.Empty); + throw new ArgumentOutOfRangeException(nameof(offset), offset, string.Empty); } CheckDisposed(); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs index b2d45b4b1fa..0e76c83d435 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs @@ -79,7 +79,7 @@ public static object Load(Stream stream) { if (stream == null) { - throw new ArgumentNullException("stream"); + throw new ArgumentNullException(nameof(stream)); } return Load(stream, null); @@ -95,7 +95,7 @@ public static object Load(XmlReader reader) { if (reader == null) { - throw new ArgumentNullException("reader"); + throw new ArgumentNullException(nameof(reader)); } return Load(reader, null, XamlParseMode.Synchronous); @@ -112,7 +112,7 @@ public static object Load(Stream stream, ParserContext parserContext) { if (stream == null) { - throw new ArgumentNullException("stream"); + throw new ArgumentNullException(nameof(stream)); } if (parserContext == null) { @@ -134,9 +134,9 @@ public static object Load(Stream stream, ParserContext parserContext) /// public object LoadAsync(Stream stream) { - if (null == stream) + if (stream == null) { - throw new ArgumentNullException("stream"); + throw new ArgumentNullException(nameof(stream)); } _stream = stream; @@ -161,9 +161,9 @@ public object LoadAsync(Stream stream) /// public object LoadAsync(XmlReader reader) { - if (null == reader) + if (reader == null) { - throw new ArgumentNullException("reader"); + throw new ArgumentNullException(nameof(reader)); } return LoadAsync(reader, null); @@ -182,9 +182,9 @@ public object LoadAsync(XmlReader reader) /// public object LoadAsync(Stream stream, ParserContext parserContext) { - if (null == stream) + if (stream == null) { - throw new ArgumentNullException("stream"); + throw new ArgumentNullException(nameof(stream)); } _stream = stream; @@ -220,7 +220,7 @@ private object LoadAsync(XmlReader reader, ParserContext parserContext) { if (reader == null) { - throw new ArgumentNullException("reader"); + throw new ArgumentNullException(nameof(reader)); } if (parserContext == null) @@ -682,7 +682,7 @@ internal static object Load(Stream stream, ParserContext parserContext, bool use { if (stream == null) { - throw new ArgumentNullException("stream"); + throw new ArgumentNullException(nameof(stream)); } if (parserContext == null) { @@ -705,7 +705,7 @@ internal static object Load(XmlReader reader, bool useRestrictiveXamlReader = fa { if (reader == null) { - throw new ArgumentNullException("reader"); + throw new ArgumentNullException(nameof(reader)); } return Load(reader, null, XamlParseMode.Synchronous, useRestrictiveXamlReader); @@ -879,7 +879,7 @@ public static object Load(System.Xaml.XamlReader reader) { if (reader == null) { - throw new ArgumentNullException("reader"); + throw new ArgumentNullException(nameof(reader)); } object root = null; try diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/PrintConfig/PTConverter.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/PrintConfig/PTConverter.cs index b1508fd00c0..65bc696c792 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/PrintConfig/PTConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/PrintConfig/PTConverter.cs @@ -80,14 +80,14 @@ public PrintTicketConverter(string deviceName, int clientPrintSchemaVersion) // Check input argument if (deviceName == null) { - throw new ArgumentNullException("deviceName"); + throw new ArgumentNullException(nameof(deviceName)); } // Check if we can support the schema version client has requested if ((clientPrintSchemaVersion > MaxPrintSchemaVersion) || (clientPrintSchemaVersion <= 0)) { - throw new ArgumentOutOfRangeException("clientPrintSchemaVersion"); + throw new ArgumentOutOfRangeException(nameof(clientPrintSchemaVersion)); } // Instantiate the provider object this converter instance will use. @@ -254,7 +254,7 @@ internal static PrintTicket InternalConvertDevModeToPrintTicket(PTProviderBase p // validate devMode parameter if (devMode == null) { - throw new ArgumentNullException("devMode"); + throw new ArgumentNullException(nameof(devMode)); } // validate sope parameter @@ -262,7 +262,7 @@ internal static PrintTicket InternalConvertDevModeToPrintTicket(PTProviderBase p (scope != PrintTicketScope.DocumentScope) && (scope != PrintTicketScope.JobScope)) { - throw new ArgumentOutOfRangeException("scope"); + throw new ArgumentOutOfRangeException(nameof(scope)); } MemoryStream ptStream = provider.ConvertDevModeToPrintTicket(devMode, scope); @@ -275,25 +275,25 @@ internal static byte[] InternalConvertPrintTicketToDevMode(PTProviderBase provid BaseDevModeType baseType, PrintTicketScope scope) { - // Input PrinTicket can't be null + // Input PrinTicket can't be null. if (printTicket == null) { - throw new ArgumentNullException("printTicket"); + throw new ArgumentNullException(nameof(printTicket)); } - // validate the base type value + // Validate the base type value. if ((baseType != BaseDevModeType.UserDefault) && (baseType != BaseDevModeType.PrinterDefault)) { - throw new ArgumentOutOfRangeException("baseType"); + throw new ArgumentOutOfRangeException(nameof(baseType)); } - // validate scope value + // Validate scope value. if ((scope != PrintTicketScope.PageScope) && (scope != PrintTicketScope.DocumentScope) && (scope != PrintTicketScope.JobScope)) { - throw new ArgumentOutOfRangeException("scope"); + throw new ArgumentOutOfRangeException(nameof(scope)); } MemoryStream ptStream = printTicket.GetXmlStream(); diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Collections/ObjectModel/WeakReadOnlyCollection.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Collections/ObjectModel/WeakReadOnlyCollection.cs index 03e05cb52f1..160cfaebf6f 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Collections/ObjectModel/WeakReadOnlyCollection.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Collections/ObjectModel/WeakReadOnlyCollection.cs @@ -39,7 +39,7 @@ internal class WeakReadOnlyCollection: IList, IList public WeakReadOnlyCollection(IList list) { // assumption: the WRs in list refer to T's if (list == null) { - throw new ArgumentNullException("list"); + throw new ArgumentNullException(nameof(list)); } this.list = list; } @@ -145,9 +145,9 @@ object ICollection.SyncRoot { } void ICollection.CopyTo(Array array, int index) { - if (array==null) { + if (array == null) { //ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array); - throw new ArgumentNullException("array"); + throw new ArgumentNullException(nameof(array)); } if (array.Rank != 1) { @@ -162,7 +162,7 @@ void ICollection.CopyTo(Array array, int index) { if (index < 0) { //ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.arrayIndex, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum); - throw new ArgumentOutOfRangeException("index", SR.Get(SRID.ArgumentOutOfRange_NeedNonNegNum)); + throw new ArgumentOutOfRangeException(nameof(index), SR.Get(SRID.ArgumentOutOfRange_NeedNonNegNum)); } if (array.Length - index < Count) { diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/ComponentModel/DependencyPropertyDescriptor.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/ComponentModel/DependencyPropertyDescriptor.cs index 95fd8d32f66..acc8b8dba1d 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/ComponentModel/DependencyPropertyDescriptor.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/ComponentModel/DependencyPropertyDescriptor.cs @@ -66,12 +66,12 @@ private DependencyPropertyDescriptor(PropertyDescriptor property, string name, T /// public static DependencyPropertyDescriptor FromProperty(PropertyDescriptor property) { - if (property == null) throw new ArgumentNullException("property"); + if (property == null) throw new ArgumentNullException(nameof(property)); DependencyPropertyDescriptor dpd; bool found; - lock(_cache) + lock (_cache) { found = _cache.TryGetValue(property, out dpd); } @@ -98,7 +98,7 @@ public static DependencyPropertyDescriptor FromProperty(PropertyDescriptor prope } else { - #pragma warning suppress 6506 // property is obviously not null + #pragma warning suppress 6506 // Property is obviously not null. DependencyPropertyAttribute dpa = property.Attributes[typeof(DependencyPropertyAttribute)] as DependencyPropertyAttribute; if (dpa != null) { @@ -129,8 +129,8 @@ public static DependencyPropertyDescriptor FromProperty(PropertyDescriptor prope /// internal static DependencyPropertyDescriptor FromProperty(DependencyProperty dependencyProperty, Type ownerType, Type targetType, bool ignorePropertyType) { - if (dependencyProperty == null) throw new ArgumentNullException("dependencyProperty"); - if (targetType == null) throw new ArgumentNullException("targetType"); + if (dependencyProperty == null) throw new ArgumentNullException(nameof(dependencyProperty)); + if (targetType == null) throw new ArgumentNullException(nameof(targetType)); // We have a different codepath here for attached and direct // properties. For direct properties, we route through Type @@ -196,8 +196,8 @@ internal static DependencyPropertyDescriptor FromProperty(DependencyProperty dep /// public static DependencyPropertyDescriptor FromProperty(DependencyProperty dependencyProperty, Type targetType) { - if (dependencyProperty == null) throw new ArgumentNullException("dependencyProperty"); - if (targetType == null) throw new ArgumentNullException("targetType"); + if (dependencyProperty == null) throw new ArgumentNullException(nameof(dependencyProperty)); + if (targetType == null) throw new ArgumentNullException(nameof(targetType)); // We have a different codepath here for attached and direct // properties. For direct properties, we route through Type @@ -216,7 +216,7 @@ public static DependencyPropertyDescriptor FromProperty(DependencyProperty depen // For direct properties we don't want to get the property descriptor // yet because it is very expensive. Delay it until needed. - lock(_cache) + lock (_cache) { _cache.TryGetValue(dependencyProperty, out dpd); } @@ -229,7 +229,7 @@ public static DependencyPropertyDescriptor FromProperty(DependencyProperty depen dpd = new DependencyPropertyDescriptor(null, dependencyProperty.Name, targetType, dependencyProperty, false); - lock(_cache) + lock (_cache) { _cache[dependencyProperty] = dpd; } @@ -259,9 +259,9 @@ public static DependencyPropertyDescriptor FromProperty(DependencyProperty depen /// public static DependencyPropertyDescriptor FromName(string name, Type ownerType, Type targetType) { - if (name == null) throw new ArgumentNullException("name"); - if (ownerType == null) throw new ArgumentNullException("ownerType"); - if (targetType == null) throw new ArgumentNullException("targetType"); + if (name == null) throw new ArgumentNullException(nameof(name)); + if (ownerType == null) throw new ArgumentNullException(nameof(ownerType)); + if (targetType == null) throw new ArgumentNullException(nameof(targetType)); DependencyProperty dp = DependencyProperty.FromName(name, ownerType); if (dp != null) @@ -282,9 +282,9 @@ public static DependencyPropertyDescriptor FromName(string name, Type ownerType, public static DependencyPropertyDescriptor FromName(string name, Type ownerType, Type targetType, bool ignorePropertyType) { - if (name == null) throw new ArgumentNullException("name"); - if (ownerType == null) throw new ArgumentNullException("ownerType"); - if (targetType == null) throw new ArgumentNullException("targetType"); + if (name == null) throw new ArgumentNullException(nameof(name)); + if (ownerType == null) throw new ArgumentNullException(nameof(ownerType)); + if (targetType == null) throw new ArgumentNullException(nameof(targetType)); DependencyProperty dp = DependencyProperty.FromName(name, ownerType); if (dp != null) @@ -493,7 +493,7 @@ public override TypeConverter Converter { // We only support public type converters, in order to avoid asserts. TypeConverter typeConverter = Property.Converter; - if( typeConverter.GetType().IsPublic ) + if (typeConverter.GetType().IsPublic) { return typeConverter; } From b11bdbd51d9376c21eb68f03097ef6c3407f4471 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2019 23:40:54 +0000 Subject: [PATCH 117/227] Update dependencies from https://github.com/dotnet/winforms build 20190716.5 (#1287) - Microsoft.Private.Winforms - 4.8.0-preview8.19366.5 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19366.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-06 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3097daa213..9ea415bffc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - fa013732d022c502768007ccdf354d1c565ec8c9 + 521f02c4435dd84a014727ce195294b201c22202 - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac - + https://github.com/dotnet/core-setup - 828432edc47ad23dfdd045351d1939b1e4f0cb27 + c6aac9cbaa2aafd387b8df1b78022f08c3d61aef https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int f5533f92b506e2892187d77272f25ad343c4e489 - + https://github.com/dotnet/corefx - 4b348cc28f0ec996322d4d1a62cfae300f77604e + 51cd78434953683040f93e69ed2a889e476f5cac https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index b3ab1e62375..b4847d8fa5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19365.14 + 4.6.0-preview8.19366.4 - 4.8.0-preview8.19366.4 + 4.8.0-preview8.19366.5 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27916-04 - 3.0.0-preview8.19365.14 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 + 3.0.0-preview8-27916-06 + 3.0.0-preview8.19366.4 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 4.6.0-preview4.19176.11 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 - 4.6.0-preview8.19365.14 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.4 From bbfe362173f773dfaaf2ea518c343ac894057ba5 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Tue, 16 Jul 2019 18:22:06 -0700 Subject: [PATCH 118/227] `AdditionalNoWarn` support for diagnostic builds/debugging/dev-builds (#1288) * `AdditionalNoWarn` support for debugging. * Add note. --- eng/WpfArcadeSdk/Sdk/Sdk.props | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props index d10a40453e1..d5f6c0629be 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.props +++ b/eng/WpfArcadeSdk/Sdk/Sdk.props @@ -68,6 +68,20 @@ Suppress NU1605 (Package downgrade warnings) when building inside Visual Studio --> $(NoWarn);NU1605 + + + $(AdditionalNoWarn);$(NoWarn) From 02d4a30ce54f601b290679736f7b917864f5bb16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 06:51:00 +0000 Subject: [PATCH 119/227] Update dependencies from https://github.com/dotnet/winforms build 20190716.7 (#1291) - Microsoft.Private.Winforms - 4.8.0-preview8.19366.7 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19366.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27916-13 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ea415bffc9..de879443c51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 521f02c4435dd84a014727ce195294b201c22202 + 913e2b0cf061ec01fba141c1e7f9e7a2cdfd0c3a - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e - + https://github.com/dotnet/core-setup - c6aac9cbaa2aafd387b8df1b78022f08c3d61aef + 5257c8c2bf8b492a8df9aaae89ebdc3b26356936 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int f5533f92b506e2892187d77272f25ad343c4e489 - + https://github.com/dotnet/corefx - 51cd78434953683040f93e69ed2a889e476f5cac + 05c0f516cf20cd6ae108ba034984b0cdc740732e https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index b4847d8fa5a..466efb58fa0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.5 - 4.8.0-preview8.19366.5 + 4.8.0-preview8.19366.7 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27916-06 - 3.0.0-preview8.19366.4 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 + 3.0.0-preview8-27916-13 + 3.0.0-preview8.19366.5 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 4.6.0-preview4.19176.11 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 - 4.6.0-preview8.19366.4 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.5 From 47e1d82f0f0d724c53072fc915aa81c32b118df3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 08:01:00 +0000 Subject: [PATCH 120/227] Update dependencies from https://github.com/dotnet/winforms build 20190716.8 (#1292) - Microsoft.Private.Winforms - 4.8.0-preview8.19366.8 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19366.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19366.3 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19366.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19366.3 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19366.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27916-14 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de879443c51..3b9fa25e7ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 913e2b0cf061ec01fba141c1e7f9e7a2cdfd0c3a + 0532d2262257ca43d5f121cd3e4bb1e42171e760 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/core-setup - 5257c8c2bf8b492a8df9aaae89ebdc3b26356936 + f7a00f0aa4a0dcf878a9345d260c8f4cf495b65e https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int f5533f92b506e2892187d77272f25ad343c4e489 - + https://github.com/dotnet/corefx - 05c0f516cf20cd6ae108ba034984b0cdc740732e + 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://github.com/dotnet/coreclr - 7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae + 556b874e22a9580b511976056cf9aa664a6ad8c1 - + https://github.com/dotnet/coreclr - 7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae + 556b874e22a9580b511976056cf9aa664a6ad8c1 - + https://github.com/dotnet/coreclr - 7fe3cc73d1ee4bbe81b2a5e8a62667b78a02f7ae + 556b874e22a9580b511976056cf9aa664a6ad8c1 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 466efb58fa0..56f759af045 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.10 - 4.8.0-preview8.19366.7 + 4.8.0-preview8.19366.8 - 3.0.0-preview8.19366.1 - 3.0.0-preview8.19366.1 - 3.0.0-preview8.19366.1 + 3.0.0-preview8.19366.3 + 3.0.0-preview8.19366.3 + 3.0.0-preview8.19366.3 - 3.0.0-preview8-27916-13 - 3.0.0-preview8.19366.5 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 + 3.0.0-preview8-27916-14 + 3.0.0-preview8.19366.10 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 4.6.0-preview4.19176.11 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 - 4.6.0-preview8.19366.5 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 + 4.6.0-preview8.19366.10 From 8e8877a7538719def67567b6cbb79902f2008bd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 12:23:03 +0000 Subject: [PATCH 121/227] Update dependencies from https://github.com/dotnet/arcade build 20190716.4 (#1293) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19366.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19366.4 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19366.4 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19366.4 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19366.4 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b9fa25e7ac..be686d22f4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup f7a00f0aa4a0dcf878a9345d260c8f4cf495b65e - + https://github.com/dotnet/arcade - fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 + 0dd5e2025f0049c133a8706f40e4463b193e5d17 - + https://github.com/dotnet/arcade - fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 + 0dd5e2025f0049c133a8706f40e4463b193e5d17 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 556b874e22a9580b511976056cf9aa664a6ad8c1 - + https://github.com/dotnet/arcade - fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 + 0dd5e2025f0049c133a8706f40e4463b193e5d17 - + https://github.com/dotnet/arcade - fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 + 0dd5e2025f0049c133a8706f40e4463b193e5d17 - + https://github.com/dotnet/arcade - fb27fd4d8a2b67d4333e33d4b898c65171c9f3c1 + 0dd5e2025f0049c133a8706f40e4463b193e5d17 diff --git a/eng/Versions.props b/eng/Versions.props index 56f759af045..da46dac3333 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19365.4 - 1.0.0-beta.19365.4 - 1.0.0-beta.19365.4 + 1.0.0-beta.19366.4 + 1.0.0-beta.19366.4 + 1.0.0-beta.19366.4 diff --git a/global.json b/global.json index 259d8c51301..e90aafeade3 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19365.4", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19365.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19366.4", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19366.4" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From c7adb7b17076f481e88135c063ef1c4841560fae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 13:01:42 +0000 Subject: [PATCH 122/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190716.1 (#1294) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19366.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be686d22f4b..942e7e39128 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 7f06c04e34f01baff3b3d91061ae1f242f15ce76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - f5533f92b506e2892187d77272f25ad343c4e489 + 75198f7b20e3d6470c86f3dfbcc822d2b8bdc966 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index da46dac3333..dbc61217ccf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19364.2 + 4.8.0-preview8.19366.1 From aa8527e2ded746111ea187a583f2078d0b322f9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 15:41:08 +0000 Subject: [PATCH 123/227] Update dependencies from https://github.com/dotnet/winforms build 20190717.1 (#1295) - Microsoft.Private.Winforms - 4.8.0-preview8.19367.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 942e7e39128..81095bb27da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 0532d2262257ca43d5f121cd3e4bb1e42171e760 + c36439a7ec5b9c62a3d198b7488dfd295dadb8cb diff --git a/eng/Versions.props b/eng/Versions.props index dbc61217ccf..3bd00cf9ce3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19366.8 + 4.8.0-preview8.19367.1 From 1f0765ed8aa723cbb9416db6ecfb9f8d81a7cea3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 17:41:04 +0000 Subject: [PATCH 124/227] Update dependencies from https://github.com/dotnet/winforms build 20190717.2 (#1296) - Microsoft.Private.Winforms - 4.8.0-preview8.19367.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81095bb27da..ad8bf9d505e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - c36439a7ec5b9c62a3d198b7488dfd295dadb8cb + a4a904a10260444e1f881395c56c18765d12f0c2 diff --git a/eng/Versions.props b/eng/Versions.props index 3bd00cf9ce3..3753c81b079 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19367.1 + 4.8.0-preview8.19367.2 From 715ea3fb9e84d802f67ff2169d16fa077bbeeaf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 20:30:55 +0000 Subject: [PATCH 125/227] Update dependencies from https://github.com/dotnet/winforms build 20190717.3 (#1299) - Microsoft.Private.Winforms - 4.8.0-preview8.19367.3 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19367.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-05 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad8bf9d505e..4a5419fd232 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - a4a904a10260444e1f881395c56c18765d12f0c2 + cfc5fbe869d48121605ee30224a193b2f01eaeab - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/core-setup - f7a00f0aa4a0dcf878a9345d260c8f4cf495b65e + 6616692a7281748c11e3d6873988d85a1e79fc50 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 0dd5e2025f0049c133a8706f40e4463b193e5d17 - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 75198f7b20e3d6470c86f3dfbcc822d2b8bdc966 - + https://github.com/dotnet/corefx - 7f06c04e34f01baff3b3d91061ae1f242f15ce76 + d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 3753c81b079..cf52c95df89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19366.10 + 4.6.0-preview8.19367.3 - 4.8.0-preview8.19367.2 + 4.8.0-preview8.19367.3 @@ -18,25 +18,25 @@ - 3.0.0-preview8-27916-14 - 3.0.0-preview8.19366.10 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 + 3.0.0-preview8-27917-05 + 3.0.0-preview8.19367.3 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 4.6.0-preview4.19176.11 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 - 4.6.0-preview8.19366.10 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 + 4.6.0-preview8.19367.3 From f85c653493ee5c69680ae9af34ef9289e55e9154 Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Wed, 17 Jul 2019 14:53:16 -0700 Subject: [PATCH 126/227] Default to 'true' for unset msbuild properties owned by WPF (#1300) --- .../targets/Microsoft.NET.Sdk.WindowsDesktop.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props index 985437424fe..923c2d9bdf3 100644 --- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props +++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props @@ -1,6 +1,8 @@ <_MicrosoftNetSdkWindowsDesktop>true + true + true From 08e3f079b8892ad73b5e6026cc0ae4413ed27857 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Wed, 17 Jul 2019 15:53:39 -0700 Subject: [PATCH 127/227] open xaml file first in editor (#1007) * open xaml file first in editor * add no output items if run from the command line --- .../WpfApplication-CSharp/.template.config/template.json | 8 ++++++-- .../.template.config/template.json | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json index 0a16e0681e6..7de4edc5be9 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json @@ -59,6 +59,10 @@ { "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "MainWindow.xaml.cs" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "MainWindow.xaml" } ], "defaultName": "WpfApp1", @@ -74,11 +78,11 @@ }, { "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "description": "Opens MainWindow.xaml.cs in the editor", + "description": "Opens MainWindow.xaml in the editor", "manualInstructions": [ ], "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", "args": { - "files": "1" + "files": "1;2" }, "continueOnError": true } diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json index 32591b70599..d0697fd107c 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json @@ -59,6 +59,10 @@ { "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", "path": "MainWindow.xaml.vb" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "MainWindow.xaml" } ], "defaultName": "WpfApp1", @@ -74,11 +78,11 @@ }, { "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "description": "Opens MainWindow.xaml.vb in the editor", + "description": "Opens MainWindow.xaml in the editor", "manualInstructions": [ ], "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", "args": { - "files": "1" + "files": "1;2" }, "continueOnError": true } From adf7f3e61a0e4a8a8b771d8f87ac2e36d9708457 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2019 23:05:57 +0000 Subject: [PATCH 128/227] Update dependencies from https://github.com/dotnet/winforms build 20190717.4 (#1303) - Microsoft.Private.Winforms - 4.8.0-preview8.19367.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-27917-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a5419fd232..8dff00eda15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - cfc5fbe869d48121605ee30224a193b2f01eaeab + 7edae7ad900a7381652c257d9410b2f04795e846 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://github.com/dotnet/core-setup - 6616692a7281748c11e3d6873988d85a1e79fc50 + fbe24089c59a9f330dfb7c4db4ae97a293685510 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index cf52c95df89..5aaa8b34ca9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19367.3 + 4.8.0-preview8.19367.4 @@ -18,7 +18,7 @@ - 3.0.0-preview8-27917-05 + 3.0.0-preview8-27917-07 3.0.0-preview8.19367.3 4.6.0-preview8.19367.3 4.6.0-preview8.19367.3 From c155bce0738fab97a981008f22896246abd555ff Mon Sep 17 00:00:00 2001 From: Steven Kirbach Date: Thu, 18 Jul 2019 11:44:09 -0700 Subject: [PATCH 129/227] fixing DrtXpsApi failures (#1301) * fixing xps code * responding to PR feedback * undo line ending change --- .../ReachFramework/Packaging/XpsDocument.cs | 30 +- .../Packaging/XpsFixedDocumentReaderWriter.cs | 67 +- .../XpsFixedDocumentSequenceReaderWriter.cs | 47 +- .../Packaging/XmlDigitalSignatureProcessor.cs | 2487 +++++++++-------- 4 files changed, 1322 insertions(+), 1309 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsDocument.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsDocument.cs index 3eca3c41df0..8b19df2ba8f 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsDocument.cs +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsDocument.cs @@ -325,26 +325,28 @@ public ReadOnlyCollection Signatures foreach( PackagePart part in xmlPartList ) { - Stream stream = part.GetStream(FileMode.Open, FileAccess.Read ); - // - // An empty stream contains not version extensibility thus is valid - // We do create empty parts for print tickets - // - if( stream.Length == 0 ) - continue; - try + using (Stream stream = part.GetStream(FileMode.Open, FileAccess.Read)) { - if( StreamContainsVersionExtensiblity(stream) ) + // + // An empty stream contains not version extensibility thus is valid + // We do create empty parts for print tickets + // + if (stream.Length == 0) + continue; + try + { + if (StreamContainsVersionExtensiblity(stream)) + { + isSignable = false; + break; + } + } + catch (XmlException) { isSignable = false; break; } } - catch( XmlException ) - { - isSignable = false; - break; - } } return isSignable; } diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentReaderWriter.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentReaderWriter.cs index 4396796c292..33983f1afb8 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentReaderWriter.cs +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentReaderWriter.cs @@ -950,23 +950,25 @@ IList linkTargetStream void ParsePages() { - Stream stream = _metroPart.GetStream(FileMode.Open); - // - // If the stream is empty there are no pages to parse - // - if( stream.Length > 0 ) + using (Stream stream = _metroPart.GetStream(FileMode.Open)) { - XmlTextReader reader = new XmlTextReader(stream); - - while( reader.Read() ) + // + // If the stream is empty there are no pages to parse + // + if (stream.Length > 0) { - if( reader.NodeType == XmlNodeType.Element && reader.Name == XpsS0Markup.PageContent) + XmlTextReader reader = new XmlTextReader(stream); + + while (reader.Read()) { - string attribute = reader.GetAttribute(XmlTags.Source); - if( attribute != null ) + if (reader.NodeType == XmlNodeType.Element && reader.Name == XpsS0Markup.PageContent) { - Uri relativeUri = new Uri(attribute, UriKind.Relative); - AddPageToCache(PackUriHelper.ResolvePartUri( Uri, relativeUri)); + string attribute = reader.GetAttribute(XmlTags.Source); + if (attribute != null) + { + Uri relativeUri = new Uri(attribute, UriKind.Relative); + AddPageToCache(PackUriHelper.ResolvePartUri(Uri, relativeUri)); + } } } } @@ -1074,14 +1076,16 @@ IList linkTargetStream Collection sigDefCollection ) { - XmlTextReader reader = new XmlTextReader( sigDefPart.GetStream(FileMode.Open) ); - while( reader.Read() ) + using (XmlTextReader reader = new XmlTextReader(sigDefPart.GetStream(FileMode.Open))) { - if( reader.NodeType == XmlNodeType.Element && - reader.Name == XpsS0Markup.SignatureDefinitions - ) + while (reader.Read()) { - ParseSignatureDefinitions( reader, sigDefCollection ); + if (reader.NodeType == XmlNodeType.Element && + reader.Name == XpsS0Markup.SignatureDefinitions + ) + { + ParseSignatureDefinitions(reader, sigDefCollection); + } } } } @@ -1124,21 +1128,20 @@ Collection sigDefCollection { sigDefPart = CurrentXpsManager.AddSignatureDefinitionPart( _metroPart ); } - Stream stream = sigDefPart.GetStream(FileMode.Create); - XmlTextWriter writer = new XmlTextWriter( - stream, - System.Text.Encoding.UTF8 - ); - writer.WriteStartDocument(); - writer.WriteStartElement( XpsS0Markup.SignatureDefinitions, - XpsS0Markup.SignatureDefinitionNamespace); - foreach( XpsSignatureDefinition sigDef in _signatureDefinitions ) + + using (Stream stream = sigDefPart.GetStream(FileMode.Create)) + using (XmlTextWriter writer = new XmlTextWriter(stream, System.Text.Encoding.UTF8)) { - sigDef.WriteXML( writer ); + writer.WriteStartDocument(); + writer.WriteStartElement(XpsS0Markup.SignatureDefinitions, + XpsS0Markup.SignatureDefinitionNamespace); + foreach (XpsSignatureDefinition sigDef in _signatureDefinitions) + { + sigDef.WriteXML(writer); + } + writer.WriteEndElement(); } - writer.WriteEndElement(); - writer.Close(); - stream.Close(); + _sigCollectionDirty = false; } diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentSequenceReaderWriter.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentSequenceReaderWriter.cs index 272c2738042..0786fe03150 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentSequenceReaderWriter.cs +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentSequenceReaderWriter.cs @@ -546,28 +546,31 @@ Uri partUri void ParseDocuments() { - Stream stream = _metroPart.GetStream(FileMode.Open); - // - // If the stream is empty there are no documents to parse - // - if( stream.Length > 0 ) - { - XmlTextReader reader = new XmlTextReader(stream); - - while( reader.Read() ) - { - if( reader.NodeType == XmlNodeType.Element && reader.Name == XpsS0Markup.DocumentReference) - { - string attribute = reader.GetAttribute(XmlTags.Source); - if( attribute != null ) - { - Uri relativeUri = new Uri(attribute, UriKind.Relative); - //This routine properly adds DocumentReaderWriter to the _documentCache - AddDocumentToCache(PackUriHelper.ResolvePartUri( Uri, relativeUri)); - } - } - } - } + using (Stream stream = _metroPart.GetStream(FileMode.Open)) + { + // + // If the stream is empty there are no documents to parse + // + if (stream.Length > 0) + { + XmlTextReader reader = new XmlTextReader(stream); + + while (reader.Read()) + { + if (reader.NodeType == XmlNodeType.Element && reader.Name == XpsS0Markup.DocumentReference) + { + string attribute = reader.GetAttribute(XmlTags.Source); + if (attribute != null) + { + Uri relativeUri = new Uri(attribute, UriKind.Relative); + //This routine properly adds DocumentReaderWriter to the _documentCache + AddDocumentToCache(PackUriHelper.ResolvePartUri(Uri, relativeUri)); + } + } + } + } + } + } ///

diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs index 55d616dcca9..5706e3438f6 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs @@ -1,1241 +1,1246 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -// -// -// Description: -// Implementation of the W3C Digital Signature Handler. -// Generates and consumes XmlDSig-compliant digital signatures based on the subset -// specified by the Opc file format. -// - - -using System; -using System.Diagnostics; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.Runtime.InteropServices; -using System.Runtime.Serialization; -using System.Security; // for SecurityCritical and SecurityTreatAsSafe -using System.Security.Cryptography; -using System.Security.Cryptography.Xml; -using System.Security.Cryptography.X509Certificates; -using System.Xml; -using System.IO; -using System.Windows; -using System.IO.Packaging; -using Microsoft.Win32; -using MS.Internal; -using MS.Internal.WindowsBase; - -using MS.Internal.IO.Packaging.Extensions; - -namespace MS.Internal.IO.Packaging -{ - /// - /// Signature Handler implementation that follows the Feb 12, 2002 W3C DigSig Recommendation - /// - /// See: http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/ for details - internal class XmlDigitalSignatureProcessor - { - //------------------------------------------------------ - // - // Internal Methods - // - //------------------------------------------------------ - - /// - /// Constructor - called from PackageDigitalSignatureManager when opening an existing signature - /// - /// current DigitalSignatureManager - /// public signature object - /// the part that will/does house the associated XML signature - internal XmlDigitalSignatureProcessor(PackageDigitalSignatureManager manager, - PackagePart signaturePart, PackageDigitalSignature packageSignature) : this(manager, signaturePart) - { - _signature = packageSignature; - } - - /// - /// Factory method that creates a new PackageDigitalSignature - /// - internal static PackageDigitalSignature Sign( - PackageDigitalSignatureManager manager, - PackagePart signaturePart, - IEnumerable parts, - IEnumerable relationshipSelectors, - X509Certificate2 signer, - String signatureId, - bool embedCertificate, - IEnumerable signatureObjects, - IEnumerable objectReferences) - { - // create - XmlDigitalSignatureProcessor p = new XmlDigitalSignatureProcessor(manager, signaturePart); - - // and sign - return p.Sign(parts, relationshipSelectors, signer, signatureId, - embedCertificate, signatureObjects, objectReferences); - } - - /// - /// Verify the given signature - /// - /// throws if no certificate found in the signature - /// true if the data stream has not been altered since it was signed - internal bool Verify() - { - return Verify(Signer); - } - - /// - /// Verify the given signature - /// - /// certificate to use (ignores any embedded cert) - /// true if the data stream has not been altered since it was signed - internal bool Verify(X509Certificate2 signer) - { - Invariant.Assert(signer != null); - - // Create a SignedXml to do the dirty work - SignedXml xmlSig = EnsureXmlSignatureParsed(); - - bool result = false; - - // Validate the Reference tags in the SignedInfo as per the - // restrictions imposed by the OPC spec - ValidateReferences(xmlSig.SignedInfo.References, true /*allowPackageSpecificReference*/); - - // verify "standard" XmlSignature portions - result = xmlSig.CheckSignature(signer, true); - - if (result) - { - HashAlgorithm hashAlgorithm = null; // optimize - generally only need to create and re-use one of these - String currentHashAlgorithmName = String.Empty; // guaranteed not to match - - try - { - try - { - // if that succeeds, verify the Manifest including Part/Relationship content and ContentTypes - ParsePackageDataObject(); - } - catch (XmlException) - { - // parsing exception - means this is a bad signature - return false; - } - - foreach (PartManifestEntry partEntry in _partEntryManifest) - { - // compare the content - Stream s = null; - - // Relationship requires special handling - if (partEntry.IsRelationshipEntry) - { - // This behaves correctely even if the Relationship Part is missing entirely - s = GetRelationshipStream(partEntry); - } - else // Part entry - inspect raw stream - { - // part is guaranteed to exist at this point because we fail early in PackageDigitalSignature.Verify() - Debug.Assert(_manager.Package.PartExists(partEntry.Uri)); - - // Compare the content type first so we can fail early if it doesn't match - // (faster than hashing the content itself). - // Compare ordinal case-sensitive which is more strict than normal ContentType - // comparision because this is manadated by the OPC specification. - PackagePart part = _manager.Package.GetPart(partEntry.Uri); - if (String.CompareOrdinal( - partEntry.ContentType.OriginalString, - part.ValidatedContentType().OriginalString) != 0) - { - result = false; // content type mismatch - break; - } - s = part.GetStream(FileMode.Open, FileAccess.Read); - } - - using (s) - { - // ensure hash algorithm object is available - re-use if possible - if (((hashAlgorithm != null) && (!hashAlgorithm.CanReuseTransform)) || - String.CompareOrdinal(partEntry.HashAlgorithm, currentHashAlgorithmName) != 0) - { - if (hashAlgorithm != null) - ((IDisposable)hashAlgorithm).Dispose(); - - currentHashAlgorithmName = partEntry.HashAlgorithm; - hashAlgorithm = GetHashAlgorithm(currentHashAlgorithmName); - - // not a supported or recognized algorithm? - if (hashAlgorithm == null) - { - // return invalid result instead of throwing exception - result = false; - break; - } - } - - // calculate hash - String base64EncodedHashValue = GenerateDigestValue(s, partEntry.Transforms, hashAlgorithm); - - // now compare the hash - must be identical - if (String.CompareOrdinal(base64EncodedHashValue, partEntry.HashValue) != 0) - { - result = false; // hash mismatch - break; - } - } - } - } - finally - { - if (hashAlgorithm != null) - ((IDisposable)hashAlgorithm).Dispose(); - } - } - - return result; - } - - /// - /// Get the list of transforms applied to the given part (works for Relationship parts too) - /// - /// part to get transforms for - /// possibly empty, ordered list of transforms applied to the given part (never null) - /// This method only returns transform names. Transform-specific properties can be obtained by parsing the actual - /// signature contents which conform to the W3C XmlDSig spec. - internal List GetPartTransformList(Uri partName) - { - // query the parsed manifest - ParsePackageDataObject(); - - List transformList = null; - - // look through the manifest for the requested part - foreach (PartManifestEntry entry in _partEntryManifest) - { - if (System.IO.Packaging.PackUriHelper.ComparePartUri(entry.Uri, partName) == 0) - { - transformList = entry.Transforms; - break; - } - } - - // never return null - an empty list is better form - if (transformList == null) - transformList = new List(); - - return transformList; - } - - //------------------------------------------------------ - // - // Internal Properties - // - //------------------------------------------------------ - - /// - /// Content type of signature parts created by this processor - /// - internal static ContentType ContentType - { - get - { - return _xmlSignaturePartType; - } - } - - - /// - /// Associated signature part - /// - internal PackagePart SignaturePart - { - get - { - return _signaturePart; - } - } - - - /// - /// Obtain the list of signed parts - /// - /// Authors identity in handler-proprietary format - /// if signature xml is malformed - internal List PartManifest - { - get - { - ParsePackageDataObject(); - return _partManifest; - } - } - - /// - /// Obtain the author's identity as a byte stream - /// - /// Authors identity in handler-proprietary format - /// if signature xml is malformed - internal List RelationshipManifest - { - get - { - ParsePackageDataObject(); - return _relationshipManifest; - } - } - - /// - /// Obtain the author's identity in X509 Certificate form - /// - /// Authors identity as a certificate in X509 form, or null if none found - internal X509Certificate2 Signer - { - get - { - // lazy init when loading existing cert - Sign may have assigned this for us - if (_certificate == null) - { - // first look for cert part - if (PackageSignature.GetCertificatePart() != null) - _certificate = PackageSignature.GetCertificatePart().GetCertificate(); - else - { - // look in signature - if (_lookForEmbeddedCert) - { - IEnumerator keyInfoClauseEnum = EnsureXmlSignatureParsed().KeyInfo.GetEnumerator(typeof(KeyInfoX509Data)); - while (keyInfoClauseEnum.MoveNext()) - { - KeyInfoX509Data x509Data = (KeyInfoX509Data)keyInfoClauseEnum.Current; - foreach (X509Certificate2 cert in x509Data.Certificates) - { - // just take the first one for now - _certificate = cert; - break; - } - - // just need one for now - if (_certificate != null) - break; - } - - // only need to do this once - _lookForEmbeddedCert = false; - } - } - } - - return _certificate; // may be null - } - } - - /// - /// encrypted hash value - /// - /// - internal byte[] SignatureValue - { - get - { - return EnsureXmlSignatureParsed().SignatureValue; - } - } - - /// - /// The object that actually creates the signature - /// Note: This API is exposed to the public API surface through the - /// PackageDigitalSignature.Signature property. Through this API it is - /// possible to create Signatures that are not OPC compliant. However, - /// at verify time, we will throw exceptions for non-conforming signatures. - /// - /// object of type System.Security.Cryptography.Xml.Signature - internal Signature Signature - { - get - { - return EnsureXmlSignatureParsed().Signature; - } - set - { - UpdatePartFromSignature(value); - } - } - - /// - /// Get the given signature - /// - internal PackageDigitalSignature PackageSignature - { - get - { - return _signature; - } - } - - /// - /// Time that the signature was created - /// - /// Time of signing if available, or DateTime.MinValue if signature was not time-stamped - internal DateTime SigningTime - { - get - { - // lazy init - ParsePackageDataObject(); - return _signingTime; - } - } - - internal String TimeFormat - { - get - { - // lazy init - ParsePackageDataObject(); - return _signingTimeFormat; - } - } - - //------------------------------------------------------ - // - // Digest Helper Functions - // - //------------------------------------------------------ - /// - /// Generate digest value tag - /// - /// - /// name of the single transform to use - may be null - /// hash algorithm to use - /// - internal static String GenerateDigestValue( - Stream s, - String transformName, - HashAlgorithm hashAlgorithm) - { - List transforms = null; - if (transformName != null) - { - transforms = new List(1); - transforms.Add(transformName); - } - return GenerateDigestValue(s, transforms, hashAlgorithm); - } - - /// - /// Generate digest value tag - /// - /// transforms to apply - may be null and list may contain empty strings - /// stream to hash - /// algorithm to use - internal static String GenerateDigestValue( - Stream s, - List transforms, - HashAlgorithm hashAlgorithm) - { - s.Seek(0, SeekOrigin.Begin); - - // We need to be able to dispose streams generated by the - // Transform object but we don't want to dispose the stream - // passed to us so we insert this to block any propagated Dispose() calls. - Stream transformStream = new IgnoreFlushAndCloseStream(s); - - List transformStreams = null; - - // canonicalize the part content if asked - if (transforms != null) - { - transformStreams = new List(transforms.Count); - transformStreams.Add(transformStream); - foreach (String transformName in transforms) - { - // ignore empty strings at this point (as well as Relationship Transforms) - these are legal - if ((transformName.Length == 0) - || (String.CompareOrdinal(transformName, XTable.Get(XTable.ID.RelationshipsTransformName)) == 0)) - { - continue; - } - - // convert the transform names into objects (if defined) - Transform transform = StringToTransform(transformName); - - if (transform == null) - { - // throw XmlException so the outer loop knows the signature is invalid - throw new XmlException(SR.Get(SRID.UnsupportedTransformAlgorithm)); - } - - transformStream = TransformXml(transform, transformStream); - transformStreams.Add(transformStream); - } - } - - // hash it and encode to Base64 - String hashValueString = System.Convert.ToBase64String(HashStream(hashAlgorithm, transformStream)); - - // dispose of any generated streams - if (transformStreams != null) - { - foreach (Stream stream in transformStreams) - stream.Close(); - } - - return hashValueString; - } - - /// - /// Synthesizes a NodeList of Reference tags to hash - /// - /// - /// - internal static Stream GenerateRelationshipNodeStream(IEnumerable relationships) - { - // create a NodeList containing valid Relationship XML and serialize it to the stream - Stream s = new MemoryStream(); - - // Wrap in a stream that ignores Flush and Close so the XmlTextWriter - // will not close it. - // use UTF-8 encoding by default - using (XmlTextWriter writer = new XmlTextWriter(new IgnoreFlushAndCloseStream(s), - System.Text.Encoding.UTF8)) - { - // start outer Relationships tag - writer.WriteStartElement(XTable.Get(XTable.ID.RelationshipsTagName), PackagingUtilities.RelationshipNamespaceUri); - - // generate a valid Relationship tag according to the Opc schema - InternalRelationshipCollection.WriteRelationshipsAsXml(writer, relationships, - true, /* systematically write target mode */ - false /* not in streaming production */ - ); - - // end of Relationships tag - writer.WriteEndElement(); - } - - return s; - } - - /// - /// Convert algorithm name to object - /// - /// fully specified name - /// HashAlgorithm object or null if it does not map to a supported hash type - /// Caller is responsible for calling Dispose() on returned object - internal static HashAlgorithm GetHashAlgorithm(String hashAlgorithmName) - { - Object o = CryptoConfig.CreateFromName(hashAlgorithmName); - HashAlgorithm algorithm = o as HashAlgorithm; - - // In the case that we get a valid crypto object that is not a hash algorithm - // we should attempt to dispose it if it offers IDisposable. - if (algorithm == null && o != null) - { - IDisposable disposable = o as IDisposable; - if (disposable != null) - disposable.Dispose(); - } - - return algorithm; - } - - /// - /// IMPORTANT NOTE: - /// 1. In the XmlDigitalSignatureProcessor.IsValidXmlCanonicalizationTransform method, - /// we have similar logic regarding these two transforms.So both these methods must be updated - /// in sync. - /// - private static Transform StringToTransform(String transformName) - { - Invariant.Assert(transformName != null); - - if (String.CompareOrdinal(transformName, SignedXml.XmlDsigC14NTransformUrl) == 0) - { - return new XmlDsigC14NTransform(); - } - else if (String.CompareOrdinal(transformName, SignedXml.XmlDsigC14NWithCommentsTransformUrl) == 0) - { - return new XmlDsigC14NWithCommentsTransform(); - } - else - return null; -} - - // As per the OPC spec, only two tranforms are valid. Also, both of these happen to be - // XML canonicalization transforms. - // In the XmlSignatureManifest.ParseTransformsTag method we make use this method to - // validate the transforms to make sure that they are supported by the OPC spec and - // we also take advantage of the fact that both of them are XML canonicalization transforms - // IMPORTANT NOTE: - // 1. In the XmlDigitalSignatureProcessor.StringToTransform method, we have similar logic - // regarding these two transforms.So both these methods must be updated in sync. - // 2. If ever this method is updated to add other transforms, careful review must be done to - // make sure that methods calling this method are updated as required. - internal static bool IsValidXmlCanonicalizationTransform(String transformName) - { - Invariant.Assert(transformName != null); - - if (String.CompareOrdinal(transformName, SignedXml.XmlDsigC14NTransformUrl) == 0 || - String.CompareOrdinal(transformName, SignedXml.XmlDsigC14NWithCommentsTransformUrl) == 0) - { - return true; - } - else - return false; - } - - //------------------------------------------------------ - // - // Private Properties - // - //------------------------------------------------------ - /// - /// Helper class - /// - private SignedXml EnsureXmlSignatureParsed() - { - // lazy init - if (_signedXml == null) - { - _signedXml = new CustomSignedXml(); - - // Load the XML - XmlDocument xmlDocument = new XmlDocument(); - xmlDocument.PreserveWhitespace = true; - using (Stream s = SignaturePart.GetStream()) - { - using (XmlTextReader xmlReader = new XmlTextReader(s)) - { - //Prohibit DTD from the markup as per the OPC spec - xmlReader.ProhibitDtd = true; - - //This method expects the reader to be in ReadState.Initial. - //It will make the first read call. - PackagingUtilities.PerformInitailReadAndVerifyEncoding(xmlReader); - - //If the reader.ReadState is ReadState.Initial, then XmlDocument with perform the - //first xmlReader.Read() and start loading from that node/tag. - //If the reader.ReadState is ReadState.Intermediate, then XmlDocument, will start - //loading from that location itself. - //Note: Since in the above method we perform only the first read and will have not - //moved the reader state further down in the markup, we should be okay, and - //xmlDocument.Load will load from the very begining as intended. - xmlDocument.Load(xmlReader); - - // W3C spec allows for Signature tag to appear as an island and inherently allows - // for multiple Signature tags within the same XML document. - // OPC restricts this to a single, root-level Signature tag. However, Signature - // tags are allowed to exist within the non-OPC Object tags within an OPC signature. - // This is common for XAdES signatures and must be explicitly allowed. - XmlNodeList nodeList = xmlDocument.ChildNodes; - if (nodeList == null || nodeList.Count == 0 || nodeList.Count > 2) - throw new XmlException(SR.Get(SRID.PackageSignatureCorruption)); - - XmlNode node = nodeList[0]; - if (nodeList.Count == 2) - { - // First node must be the XmlDeclaration - if (nodeList[0].NodeType != XmlNodeType.XmlDeclaration) - throw new XmlException(SR.Get(SRID.PackageSignatureCorruption)); - - // Second node must be in the w3c namespace, and must be the tag - node = nodeList[1]; - } - - if ((node.NodeType != XmlNodeType.Element) || - (String.CompareOrdinal(node.NamespaceURI, SignedXml.XmlDsigNamespaceUrl) != 0) || - (String.CompareOrdinal(node.LocalName, XTable.Get(XTable.ID.SignatureTagName)) != 0)) - { - throw new XmlException(SR.Get(SRID.PackageSignatureCorruption)); - } - - // instantiate the SignedXml from the xmlDoc - _signedXml.LoadXml((XmlElement)node); - } - } - } - - // As per the OPC spec, only two Canonicalization methods can be specified - if (!IsValidXmlCanonicalizationTransform(_signedXml.SignedInfo.CanonicalizationMethod)) - throw new XmlException(SR.Get(SRID.UnsupportedCanonicalizationMethod)); - - // As per OPC spec, signature ID must be NCName - if (_signedXml.Signature.Id != null) - { - try - { - System.Xml.XmlConvert.VerifyNCName(_signedXml.Signature.Id); - } - catch (System.Xml.XmlException) - { - throw new XmlException(SR.Get(SRID.PackageSignatureCorruption)); - } - } - - return _signedXml; - } - - //------------------------------------------------------ - // - // Private Methods - // - //------------------------------------------------------ - - /// - /// Constructor - called from public constructor as well as static Sign() method - /// - /// current DigitalSignatureManager - /// the part that will/does house the associated XML signature - private XmlDigitalSignatureProcessor(PackageDigitalSignatureManager manager, - PackagePart signaturePart) - { - Invariant.Assert(manager != null); - Invariant.Assert(signaturePart != null); - - _signaturePart = signaturePart; - _manager = manager; - _lookForEmbeddedCert = true; - } - - /// - /// Create a new PackageDigitalSignature - /// - /// the data being protected by this signature - /// possibly null collection of relationshipSelectors that represent the - /// relationships that are to be signed - /// Identity of the author - /// Id attribute of the new Xml Signature - /// true if caller wants certificate embedded in the signature itself - /// references - /// objects to sign - private PackageDigitalSignature Sign( - IEnumerable parts, - IEnumerable relationshipSelectors, - X509Certificate2 signer, - String signatureId, - bool embedCertificate, - IEnumerable signatureObjects, - IEnumerable objectReferences) - { - // don't overwrite - Debug.Assert(SignaturePart.GetStream().Length == 0, "Logic Error: Can't sign when signature already exists"); - - // grab hash algorithm as this may change in the future - _hashAlgorithmName = _manager.HashAlgorithm; - - // keep the signer if indicated - if (_manager.CertificateOption == CertificateEmbeddingOption.NotEmbedded) - _lookForEmbeddedCert = false; // don't bother parsing - else - _certificate = signer; // save some parsing - - // we only release this key if we obtain it - AsymmetricAlgorithm key = null; - if (signer.HasPrivateKey) - { - key = GetPrivateKey(signer); - } - else - { - key = GetPrivateKeyForSigning(signer); - } - - try - { - _signedXml = new CustomSignedXml(); - _signedXml.SigningKey = key; - _signedXml.Signature.Id = signatureId; - - if (BaseCompatibilityPreferences.MatchPackageSignatureMethodToPackagePartDigestMethod) - { - // Defaulting to SHA1 for key signing is counter-productive if the hash algorithm - // for the rest of the package is more secure. So if we have a selected hash - // algorithm in the PackageDigitalSignatureManager that is more secure, then - // select an equivalent level algorithm for key signing. - _signedXml.SignedInfo.SignatureMethod = SelectSignatureMethod(key); - } - - // Track if we are matching the signature method in order to retry on failure - bool usingMatchingSignatureMethod = _signedXml.SignedInfo.SignatureMethod != null; - - // put it in the XML - if (embedCertificate) - { - _signedXml.KeyInfo = GenerateKeyInfo(key, signer); - } - - // Package object tag - // convert from string to class and ensure we dispose - using (HashAlgorithm hashAlgorithm = GetHashAlgorithm(_hashAlgorithmName)) - { - // inform caller if hash algorithm is unknown - if (hashAlgorithm == null) - throw new InvalidOperationException(SR.Get(SRID.UnsupportedHashAlgorithm)); - - _signedXml.AddObject(GenerateObjectTag(hashAlgorithm, parts, relationshipSelectors, signatureId)); - } - - // add reference from SignedInfo to Package object tag - Reference objectReference = new Reference(XTable.Get(XTable.ID.OpcLinkAttrValue)); - objectReference.Type = XTable.Get(XTable.ID.W3CSignatureNamespaceRoot) + "Object"; - objectReference.DigestMethod = _hashAlgorithmName; - _signedXml.AddReference(objectReference); - - // add any custom object tags - AddCustomObjectTags(signatureObjects, objectReferences); - - // compute the signature - SignedXml xmlSig = _signedXml; - - try - { - xmlSig.ComputeSignature(); - } - catch (CryptographicException) when (usingMatchingSignatureMethod) - { - // We've hit a state where System.Security is possibly missing the required updates to process the matched signature. - // Disable our matching and attempt to sign again with the default SignatureMethod - BaseCompatibilityPreferences.MatchPackageSignatureMethodToPackagePartDigestMethod = false; - xmlSig.SignedInfo.SignatureMethod = null; - xmlSig.ComputeSignature(); - } - - // persist - UpdatePartFromSignature(_signedXml.Signature); - } - finally - { - if (key != null) - ((IDisposable)key).Dispose(); - } - - // create the PackageDigitalSignature object - _signature = new PackageDigitalSignature(_manager, this); - return _signature; - } - - /// - /// Attempt to select a key signing method that matches the strength of the selected - /// hash algorithm in the PackageDigitalSignatureManager. - /// - /// If no algorithm was selected, defaults to SHA1. - /// - /// - /// DSA keys have no supported stronger signing solution and are always SHA1 signed. - /// - /// The key being used - /// The URI of the appropriate signing method - private string SelectSignatureMethod(AsymmetricAlgorithm key) - { - string signatureMethod = null; - - if (key is RSA) - { - _rsaSigMethodLookup.TryGetValue(_manager.HashAlgorithm, out signatureMethod); - } - - return signatureMethod; - } - - /// - /// Extracts the private key from the X509Certificate2 certificate - /// - /// certificate for which we are looking for the private key - /// returns the private key - private static AsymmetricAlgorithm GetPrivateKey(X509Certificate2 cert) - { - // Adding support for CNG certificates. The default certificate template in Windows Server 2008+ is CNG - // Get[Algorithm]PrivateKey methods returns unique object while PrivateKey property returns shared one - // Make sure to dispose the key if it is from Get[Algorithm]PrivateKey methods - AsymmetricAlgorithm key = cert.GetRSAPrivateKey(); - if (key != null) - return key; - - key = cert.GetDSAPrivateKey(); - if (key != null) - return key; - - key = cert.GetECDsaPrivateKey(); - if (key != null) - return key; - - // Get[Algorithm]PrivateKey methods would always have returned the private key if the PrivateKey property would - // But Get[Algorithm]PrivateKey methods never throw but returns null in case of error during cryptographic operations - // But we want exception to be thrown when an error occurs during a cryptographic operation so that we can revert the changes - return cert.PrivateKey; - } - - /// - /// Assembles the sorted list of relationships for this part entry and - /// generates a stream with the Xml-equivalent as defined in the Opc spec - /// - /// relationship-type part entry - /// - private Stream GetRelationshipStream(PartManifestEntry partEntry) - { - Debug.Assert(partEntry.IsRelationshipEntry); - - //Get the list of relationships from the RelationshipSelectors for this part - SortedDictionary partRelationships = - new SortedDictionary(StringComparer.Ordinal); - foreach (System.IO.Packaging.PackageRelationshipSelector relationshipSelector in partEntry.RelationshipSelectors) - { - foreach (System.IO.Packaging.PackageRelationship r in relationshipSelector.Select(_manager.Package)) - { - if(!partRelationships.ContainsKey(r.Id)) - partRelationships.Add(r.Id, r); - } - } - - return GenerateRelationshipNodeStream(partRelationships.Values); - } - - private void AddCustomObjectTags(IEnumerable signatureObjects, - IEnumerable objectReferences) - { - Invariant.Assert(_signedXml != null); - - - // add any references - if (objectReferences != null) - { - // Validate the Reference tags in the SignedInfo as per the - // restrictions imposed by the OPC spec - ValidateReferences(objectReferences, false /*allowPackageSpecificReference*/); - - foreach (Reference reference in objectReferences) - { - // consistent hash algorithm for entire signature - reference.DigestMethod = _hashAlgorithmName; - _signedXml.AddReference(reference); - } - } - - // any object tags - if (signatureObjects != null) - { - // thes have been pre-screened for matches against reserved OpcAttrValue and duplicates - foreach (DataObject obj in signatureObjects) - { - _signedXml.AddObject(obj); - } - } - } - - private void UpdatePartFromSignature(Signature sig) - { - // write to stream - using (Stream s = SignaturePart.GetStream(FileMode.Create, FileAccess.Write)) - { - using (XmlTextWriter xWriter = new XmlTextWriter(s, System.Text.Encoding.UTF8)) - { - xWriter.WriteStartDocument(true); - sig.GetXml().WriteTo(xWriter); - xWriter.WriteEndDocument(); - } - } - _signedXml = null; // force a re-parse - } - - private static byte[] HashStream(HashAlgorithm hashAlgorithm, Stream s) - { - s.Seek(0, SeekOrigin.Begin); - - // reset algorithm - hashAlgorithm.Initialize(); - return hashAlgorithm.ComputeHash(s); - } - - private static Stream TransformXml(Transform xForm, Object source) - { - // transform - xForm.LoadInput(source); - - return (Stream)xForm.GetOutput(); - } - - /// - /// Full parse of the Package-specific Object tag - /// - /// Side effect of updating _signingTime, _signingTimeFormat, - /// _partManifest, _partEntryManifest and _relationshipManifest - /// throws if markup does not match OPC spec - private void ParsePackageDataObject() - { - if (!_dataObjectParsed) - { - EnsureXmlSignatureParsed(); - - // find the package-specific Object tag - XmlNodeList nodeList = GetPackageDataObject().Data; - - // The legal parent is a "Package" Object tag with 2 children - // and - if (nodeList.Count != 2) - throw new XmlException(SR.Get(SRID.XmlSignatureParseError)); - - // get a NodeReader that allows us to easily and correctly skip comments - XmlReader reader = new XmlNodeReader(nodeList[0].ParentNode); - - // parse the tag - ensure that it is in the correct namespace - reader.Read(); // enter the Object tag - if (String.CompareOrdinal(reader.NamespaceURI, SignedXml.XmlDsigNamespaceUrl) != 0) - throw new XmlException(SR.Get(SRID.XmlSignatureParseError)); - - string signaturePropertiesTagName = XTable.Get(XTable.ID.SignaturePropertiesTagName); - string manifestTagName = XTable.Get(XTable.ID.ManifestTagName); - bool signaturePropertiesTagFound = false; - bool manifestTagFound = false; - while (reader.Read() && (reader.NodeType == XmlNodeType.Element)) - { - if (reader.MoveToContent() == XmlNodeType.Element - && (String.CompareOrdinal(reader.NamespaceURI, SignedXml.XmlDsigNamespaceUrl) == 0) - && reader.Depth == 1) - { - if (!signaturePropertiesTagFound && String.CompareOrdinal(reader.LocalName, signaturePropertiesTagName) == 0) - { - signaturePropertiesTagFound = true; - - // parse the tag - _signingTime = XmlSignatureProperties.ParseSigningTime( - reader, _signedXml.Signature.Id, out _signingTimeFormat); - - continue; - } - else if (!manifestTagFound && String.CompareOrdinal(reader.LocalName, manifestTagName) == 0) - { - manifestTagFound = true; - - // parse the tag - XmlSignatureManifest.ParseManifest(_manager, reader, - out _partManifest, out _partEntryManifest, out _relationshipManifest); - - continue; - } - } - - throw new XmlException(SR.Get(SRID.XmlSignatureParseError)); - } - - // these must both exist on exit - if (!(signaturePropertiesTagFound && manifestTagFound)) - throw new XmlException(SR.Get(SRID.XmlSignatureParseError)); - - _dataObjectParsed = true; - } - } - - /// - /// Finds and return the package-specific Object tag - /// - /// - private DataObject GetPackageDataObject() - { - EnsureXmlSignatureParsed(); - - // look for the Package-specific object tag - String opcId = XTable.Get(XTable.ID.OpcAttrValue); - DataObject returnValue = null; - foreach (DataObject dataObject in _signedXml.Signature.ObjectList) - { - if (String.CompareOrdinal(dataObject.Id, opcId) == 0) - { - // duplicates not allowed - if (returnValue != null) - throw new XmlException(SR.Get(SRID.SignatureObjectIdMustBeUnique)); - - returnValue = dataObject; - } - } - - // Package object tag required - if (returnValue != null) - return returnValue; - else - throw new XmlException(SR.Get(SRID.PackageSignatureObjectTagRequired)); - } - - private KeyInfo GenerateKeyInfo(AsymmetricAlgorithm key, X509Certificate2 signer) - { - // KeyInfo section - KeyInfo keyInfo = new KeyInfo(); - KeyInfoName keyInfoName = new KeyInfoName(); - keyInfoName.Value = signer.Subject; - keyInfo.AddClause(keyInfoName); // human readable Principal name - - // Include the public key information (if we are familiar with the algorithm type) - if (key is RSA) - keyInfo.AddClause(new RSAKeyValue((RSA)key)); // RSA key parameters - else - { - if (key is DSA) - keyInfo.AddClause(new DSAKeyValue((DSA)key)); // DSA - else - throw new ArgumentException(SR.Get(SRID.CertificateKeyTypeNotSupported), "signer"); - } - - // the actual X509 cert - keyInfo.AddClause(new KeyInfoX509Data(signer)); - - return keyInfo; - } - - private DataObject GenerateObjectTag( - HashAlgorithm hashAlgorithm, - IEnumerable parts, IEnumerable relationshipSelectors, - String signatureId) - { - XmlDocument xDoc = new XmlDocument(); - xDoc.AppendChild(xDoc.CreateNode(XmlNodeType.Element, "root", "namespace")); // dummy root - xDoc.DocumentElement.AppendChild(XmlSignatureManifest.GenerateManifest(_manager, xDoc, hashAlgorithm, parts, relationshipSelectors)); - xDoc.DocumentElement.AppendChild(XmlSignatureProperties.AssembleSignatureProperties(xDoc, DateTime.Now, _manager.TimeFormat, signatureId)); - - DataObject dataObject = new DataObject(); - dataObject.Data = xDoc.DocumentElement.ChildNodes; - dataObject.Id = XTable.Get(XTable.ID.OpcAttrValue); - - return dataObject; - } - - /// - /// lookup the private key using the given identity - /// - /// X509Cert - /// IDisposable asymmetric algorithm that serves as a proxy to the private key. Caller must dispose - /// of properly. - private static AsymmetricAlgorithm GetPrivateKeyForSigning(X509Certificate2 signer) - { - // if the certificate does not actually contain the key, we need to look it up via ThumbPrint - Invariant.Assert(!signer.HasPrivateKey); - - // look for appropriate certificates - X509Store store = new X509Store(StoreLocation.CurrentUser); - - try - { - store.Open(OpenFlags.OpenExistingOnly | OpenFlags.ReadOnly); - - X509Certificate2Collection collection = (X509Certificate2Collection)store.Certificates; - - collection = collection.Find(X509FindType.FindByThumbprint, signer.Thumbprint, true); - if (collection.Count > 0) - { - if (collection.Count > 1) - throw new CryptographicException(SR.Get(SRID.DigSigDuplicateCertificate)); - - signer = collection[0]; - } - else - throw new CryptographicException(SR.Get(SRID.DigSigCannotLocateCertificate)); - } - finally - { - store.Close(); - } - - // get the corresponding AsymmetricAlgorithm - return GetPrivateKey(signer); - } - - - /// - /// This method validated the Reference tags as per the restrictions imposed - /// by the OPC spec. - /// NOTE: The same method is called from Verify and Sign methods. At verify time we need to make sure - /// that there is exactly one Package-specific reference. At Sign time we need to make sure that - /// there are no package-specific references in the list of references passed to Sign APIs as a - /// input parameter, since we will be generating Package-specific object. - /// - /// list of references to be validated - /// When "true", we check to make sure that there is - /// exactly one package-specific reference and when "false", we do not allow any package-specific - /// references - private void ValidateReferences(IEnumerable references, bool allowPackageSpecificReferences) - { - Debug.Assert(references != null); - - bool packageReferenceFound = false; - TransformChain currentTransformChain; - - foreach (Reference currentReference in references) - { - //As per the OPC spec, Uri attribute in Reference elements MUST refer using fragment identifiers - //This implies that Uri cannot be absolute. - if (currentReference.Uri.StartsWith("#", StringComparison.Ordinal)) - { - //As per the OPC spec, there MUST be exactly one package specific reference to the - //package specific element - if (String.CompareOrdinal(currentReference.Uri, XTable.Get(XTable.ID.OpcLinkAttrValue)) == 0) - { - if (!allowPackageSpecificReferences) - throw new ArgumentException(SR.Get(SRID.PackageSpecificReferenceTagMustBeUnique)); - - //If there are more than one package specific tags - if (packageReferenceFound == true) - throw new XmlException(SR.Get(SRID.MoreThanOnePackageSpecificReference)); - else - packageReferenceFound = true; - } - - currentTransformChain = currentReference.TransformChain; - - for(int j=0; j _partManifest; // signed parts (suitable for return to public API) - private List _partEntryManifest; // signed parts (with extra info) - private List _relationshipManifest; // signed relationship selectors - - private static readonly ContentType _xmlSignaturePartType - = new ContentType("application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml"); - - /// - /// Mapping from hash algorithms in the PackageDigitalSignatureManager to RSA key signing methods. - /// - private static readonly Dictionary _rsaSigMethodLookup = new Dictionary(StringComparer.OrdinalIgnoreCase) - { - { "http://www.w3.org/2001/04/xmlenc#sha256", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" }, - { "http://www.w3.org/2001/04/xmldsig-more#sha384", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" }, - { "http://www.w3.org/2001/04/xmlenc#sha512", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" }, - }; - } -} - +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +// +// +// Description: +// Implementation of the W3C Digital Signature Handler. +// Generates and consumes XmlDSig-compliant digital signatures based on the subset +// specified by the Opc file format. +// + + +using System; +using System.Diagnostics; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.Runtime.InteropServices; +using System.Runtime.Serialization; +using System.Security; // for SecurityCritical and SecurityTreatAsSafe +using System.Security.Cryptography; +using System.Security.Cryptography.Xml; +using System.Security.Cryptography.X509Certificates; +using System.Xml; +using System.IO; +using System.Windows; +using System.IO.Packaging; +using Microsoft.Win32; +using MS.Internal; +using MS.Internal.WindowsBase; + +using MS.Internal.IO.Packaging.Extensions; + +namespace MS.Internal.IO.Packaging +{ + /// + /// Signature Handler implementation that follows the Feb 12, 2002 W3C DigSig Recommendation + /// + /// See: http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/ for details + internal class XmlDigitalSignatureProcessor + { + //------------------------------------------------------ + // + // Internal Methods + // + //------------------------------------------------------ + + /// + /// Constructor - called from PackageDigitalSignatureManager when opening an existing signature + /// + /// current DigitalSignatureManager + /// public signature object + /// the part that will/does house the associated XML signature + internal XmlDigitalSignatureProcessor(PackageDigitalSignatureManager manager, + PackagePart signaturePart, PackageDigitalSignature packageSignature) : this(manager, signaturePart) + { + _signature = packageSignature; + } + + /// + /// Factory method that creates a new PackageDigitalSignature + /// + internal static PackageDigitalSignature Sign( + PackageDigitalSignatureManager manager, + PackagePart signaturePart, + IEnumerable parts, + IEnumerable relationshipSelectors, + X509Certificate2 signer, + String signatureId, + bool embedCertificate, + IEnumerable signatureObjects, + IEnumerable objectReferences) + { + // create + XmlDigitalSignatureProcessor p = new XmlDigitalSignatureProcessor(manager, signaturePart); + + // and sign + return p.Sign(parts, relationshipSelectors, signer, signatureId, + embedCertificate, signatureObjects, objectReferences); + } + + /// + /// Verify the given signature + /// + /// throws if no certificate found in the signature + /// true if the data stream has not been altered since it was signed + internal bool Verify() + { + return Verify(Signer); + } + + /// + /// Verify the given signature + /// + /// certificate to use (ignores any embedded cert) + /// true if the data stream has not been altered since it was signed + internal bool Verify(X509Certificate2 signer) + { + Invariant.Assert(signer != null); + + // Create a SignedXml to do the dirty work + SignedXml xmlSig = EnsureXmlSignatureParsed(); + + bool result = false; + + // Validate the Reference tags in the SignedInfo as per the + // restrictions imposed by the OPC spec + ValidateReferences(xmlSig.SignedInfo.References, true /*allowPackageSpecificReference*/); + + // verify "standard" XmlSignature portions + result = xmlSig.CheckSignature(signer, true); + + if (result) + { + HashAlgorithm hashAlgorithm = null; // optimize - generally only need to create and re-use one of these + String currentHashAlgorithmName = String.Empty; // guaranteed not to match + + try + { + try + { + // if that succeeds, verify the Manifest including Part/Relationship content and ContentTypes + ParsePackageDataObject(); + } + catch (XmlException) + { + // parsing exception - means this is a bad signature + return false; + } + + foreach (PartManifestEntry partEntry in _partEntryManifest) + { + // compare the content + Stream s = null; + + // Relationship requires special handling + if (partEntry.IsRelationshipEntry) + { + // This behaves correctely even if the Relationship Part is missing entirely + s = GetRelationshipStream(partEntry); + } + else // Part entry - inspect raw stream + { + // part is guaranteed to exist at this point because we fail early in PackageDigitalSignature.Verify() + Debug.Assert(_manager.Package.PartExists(partEntry.Uri)); + + // Compare the content type first so we can fail early if it doesn't match + // (faster than hashing the content itself). + // Compare ordinal case-sensitive which is more strict than normal ContentType + // comparision because this is manadated by the OPC specification. + PackagePart part = _manager.Package.GetPart(partEntry.Uri); + if (String.CompareOrdinal( + partEntry.ContentType.OriginalString, + part.ValidatedContentType().OriginalString) != 0) + { + result = false; // content type mismatch + break; + } + s = part.GetStream(FileMode.Open, FileAccess.Read); + } + + using (s) + { + // ensure hash algorithm object is available - re-use if possible + if (((hashAlgorithm != null) && (!hashAlgorithm.CanReuseTransform)) || + String.CompareOrdinal(partEntry.HashAlgorithm, currentHashAlgorithmName) != 0) + { + if (hashAlgorithm != null) + ((IDisposable)hashAlgorithm).Dispose(); + + currentHashAlgorithmName = partEntry.HashAlgorithm; + hashAlgorithm = GetHashAlgorithm(currentHashAlgorithmName); + + // not a supported or recognized algorithm? + if (hashAlgorithm == null) + { + // return invalid result instead of throwing exception + result = false; + break; + } + } + + // calculate hash + String base64EncodedHashValue = GenerateDigestValue(s, partEntry.Transforms, hashAlgorithm); + + // now compare the hash - must be identical + if (String.CompareOrdinal(base64EncodedHashValue, partEntry.HashValue) != 0) + { + result = false; // hash mismatch + break; + } + } + } + } + finally + { + if (hashAlgorithm != null) + ((IDisposable)hashAlgorithm).Dispose(); + } + } + + return result; + } + + /// + /// Get the list of transforms applied to the given part (works for Relationship parts too) + /// + /// part to get transforms for + /// possibly empty, ordered list of transforms applied to the given part (never null) + /// This method only returns transform names. Transform-specific properties can be obtained by parsing the actual + /// signature contents which conform to the W3C XmlDSig spec. + internal List GetPartTransformList(Uri partName) + { + // query the parsed manifest + ParsePackageDataObject(); + + List transformList = null; + + // look through the manifest for the requested part + foreach (PartManifestEntry entry in _partEntryManifest) + { + if (System.IO.Packaging.PackUriHelper.ComparePartUri(entry.Uri, partName) == 0) + { + transformList = entry.Transforms; + break; + } + } + + // never return null - an empty list is better form + if (transformList == null) + transformList = new List(); + + return transformList; + } + + //------------------------------------------------------ + // + // Internal Properties + // + //------------------------------------------------------ + + /// + /// Content type of signature parts created by this processor + /// + internal static ContentType ContentType + { + get + { + return _xmlSignaturePartType; + } + } + + + /// + /// Associated signature part + /// + internal PackagePart SignaturePart + { + get + { + return _signaturePart; + } + } + + + /// + /// Obtain the list of signed parts + /// + /// Authors identity in handler-proprietary format + /// if signature xml is malformed + internal List PartManifest + { + get + { + ParsePackageDataObject(); + return _partManifest; + } + } + + /// + /// Obtain the author's identity as a byte stream + /// + /// Authors identity in handler-proprietary format + /// if signature xml is malformed + internal List RelationshipManifest + { + get + { + ParsePackageDataObject(); + return _relationshipManifest; + } + } + + /// + /// Obtain the author's identity in X509 Certificate form + /// + /// Authors identity as a certificate in X509 form, or null if none found + internal X509Certificate2 Signer + { + get + { + // lazy init when loading existing cert - Sign may have assigned this for us + if (_certificate == null) + { + // first look for cert part + if (PackageSignature.GetCertificatePart() != null) + _certificate = PackageSignature.GetCertificatePart().GetCertificate(); + else + { + // look in signature + if (_lookForEmbeddedCert) + { + IEnumerator keyInfoClauseEnum = EnsureXmlSignatureParsed().KeyInfo.GetEnumerator(typeof(KeyInfoX509Data)); + while (keyInfoClauseEnum.MoveNext()) + { + KeyInfoX509Data x509Data = (KeyInfoX509Data)keyInfoClauseEnum.Current; + foreach (X509Certificate2 cert in x509Data.Certificates) + { + // just take the first one for now + _certificate = cert; + break; + } + + // just need one for now + if (_certificate != null) + break; + } + + // only need to do this once + _lookForEmbeddedCert = false; + } + } + } + + return _certificate; // may be null + } + } + + /// + /// encrypted hash value + /// + /// + internal byte[] SignatureValue + { + get + { + return EnsureXmlSignatureParsed().SignatureValue; + } + } + + /// + /// The object that actually creates the signature + /// Note: This API is exposed to the public API surface through the + /// PackageDigitalSignature.Signature property. Through this API it is + /// possible to create Signatures that are not OPC compliant. However, + /// at verify time, we will throw exceptions for non-conforming signatures. + /// + /// object of type System.Security.Cryptography.Xml.Signature + internal Signature Signature + { + get + { + return EnsureXmlSignatureParsed().Signature; + } + set + { + UpdatePartFromSignature(value); + } + } + + /// + /// Get the given signature + /// + internal PackageDigitalSignature PackageSignature + { + get + { + return _signature; + } + } + + /// + /// Time that the signature was created + /// + /// Time of signing if available, or DateTime.MinValue if signature was not time-stamped + internal DateTime SigningTime + { + get + { + // lazy init + ParsePackageDataObject(); + return _signingTime; + } + } + + internal String TimeFormat + { + get + { + // lazy init + ParsePackageDataObject(); + return _signingTimeFormat; + } + } + + //------------------------------------------------------ + // + // Digest Helper Functions + // + //------------------------------------------------------ + /// + /// Generate digest value tag + /// + /// + /// name of the single transform to use - may be null + /// hash algorithm to use + /// + internal static String GenerateDigestValue( + Stream s, + String transformName, + HashAlgorithm hashAlgorithm) + { + List transforms = null; + if (transformName != null) + { + transforms = new List(1); + transforms.Add(transformName); + } + return GenerateDigestValue(s, transforms, hashAlgorithm); + } + + /// + /// Generate digest value tag + /// + /// transforms to apply - may be null and list may contain empty strings + /// stream to hash + /// algorithm to use + internal static String GenerateDigestValue( + Stream s, + List transforms, + HashAlgorithm hashAlgorithm) + { + s.Seek(0, SeekOrigin.Begin); + + // We need to be able to dispose streams generated by the + // Transform object but we don't want to dispose the stream + // passed to us so we insert this to block any propagated Dispose() calls. + Stream transformStream = new IgnoreFlushAndCloseStream(s); + + List transformStreams = null; + + // canonicalize the part content if asked + if (transforms != null) + { + transformStreams = new List(transforms.Count); + transformStreams.Add(transformStream); + foreach (String transformName in transforms) + { + // ignore empty strings at this point (as well as Relationship Transforms) - these are legal + if ((transformName.Length == 0) + || (String.CompareOrdinal(transformName, XTable.Get(XTable.ID.RelationshipsTransformName)) == 0)) + { + continue; + } + + // convert the transform names into objects (if defined) + Transform transform = StringToTransform(transformName); + + if (transform == null) + { + // throw XmlException so the outer loop knows the signature is invalid + throw new XmlException(SR.Get(SRID.UnsupportedTransformAlgorithm)); + } + + transformStream = TransformXml(transform, transformStream); + transformStreams.Add(transformStream); + } + } + + // hash it and encode to Base64 + String hashValueString = System.Convert.ToBase64String(HashStream(hashAlgorithm, transformStream)); + + // dispose of any generated streams + if (transformStreams != null) + { + foreach (Stream stream in transformStreams) + stream.Close(); + } + + return hashValueString; + } + + /// + /// Synthesizes a NodeList of Reference tags to hash + /// + /// + /// + internal static Stream GenerateRelationshipNodeStream(IEnumerable relationships) + { + // create a NodeList containing valid Relationship XML and serialize it to the stream + Stream s = new MemoryStream(); + + // Wrap in a stream that ignores Flush and Close so the XmlTextWriter + // will not close it. + // use UTF-8 encoding by default + using (XmlTextWriter writer = new XmlTextWriter(new IgnoreFlushAndCloseStream(s), + System.Text.Encoding.UTF8)) + { + // start outer Relationships tag + writer.WriteStartElement(XTable.Get(XTable.ID.RelationshipsTagName), PackagingUtilities.RelationshipNamespaceUri); + + // generate a valid Relationship tag according to the Opc schema + InternalRelationshipCollection.WriteRelationshipsAsXml(writer, relationships, + true, /* systematically write target mode */ + false /* not in streaming production */ + ); + + // end of Relationships tag + writer.WriteEndElement(); + } + + return s; + } + + /// + /// Convert algorithm name to object + /// + /// fully specified name + /// HashAlgorithm object or null if it does not map to a supported hash type + /// Caller is responsible for calling Dispose() on returned object + internal static HashAlgorithm GetHashAlgorithm(String hashAlgorithmName) + { + Object o = CryptoConfig.CreateFromName(hashAlgorithmName); + HashAlgorithm algorithm = o as HashAlgorithm; + + // In the case that we get a valid crypto object that is not a hash algorithm + // we should attempt to dispose it if it offers IDisposable. + if (algorithm == null && o != null) + { + IDisposable disposable = o as IDisposable; + if (disposable != null) + disposable.Dispose(); + } + + return algorithm; + } + + /// + /// IMPORTANT NOTE: + /// 1. In the XmlDigitalSignatureProcessor.IsValidXmlCanonicalizationTransform method, + /// we have similar logic regarding these two transforms.So both these methods must be updated + /// in sync. + /// + private static Transform StringToTransform(String transformName) + { + Invariant.Assert(transformName != null); + + if (String.CompareOrdinal(transformName, SignedXml.XmlDsigC14NTransformUrl) == 0) + { + return new XmlDsigC14NTransform(); + } + else if (String.CompareOrdinal(transformName, SignedXml.XmlDsigC14NWithCommentsTransformUrl) == 0) + { + return new XmlDsigC14NWithCommentsTransform(); + } + else + return null; +} + + // As per the OPC spec, only two tranforms are valid. Also, both of these happen to be + // XML canonicalization transforms. + // In the XmlSignatureManifest.ParseTransformsTag method we make use this method to + // validate the transforms to make sure that they are supported by the OPC spec and + // we also take advantage of the fact that both of them are XML canonicalization transforms + // IMPORTANT NOTE: + // 1. In the XmlDigitalSignatureProcessor.StringToTransform method, we have similar logic + // regarding these two transforms.So both these methods must be updated in sync. + // 2. If ever this method is updated to add other transforms, careful review must be done to + // make sure that methods calling this method are updated as required. + internal static bool IsValidXmlCanonicalizationTransform(String transformName) + { + Invariant.Assert(transformName != null); + + if (String.CompareOrdinal(transformName, SignedXml.XmlDsigC14NTransformUrl) == 0 || + String.CompareOrdinal(transformName, SignedXml.XmlDsigC14NWithCommentsTransformUrl) == 0) + { + return true; + } + else + return false; + } + + //------------------------------------------------------ + // + // Private Properties + // + //------------------------------------------------------ + /// + /// Helper class + /// + private SignedXml EnsureXmlSignatureParsed() + { + // lazy init + if (_signedXml == null) + { + _signedXml = new CustomSignedXml(); + + // Load the XML + XmlDocument xmlDocument = new XmlDocument(); + xmlDocument.PreserveWhitespace = true; + using (Stream s = SignaturePart.GetStream()) + { + using (XmlTextReader xmlReader = new XmlTextReader(s)) + { + //Prohibit DTD from the markup as per the OPC spec + xmlReader.ProhibitDtd = true; + + //This method expects the reader to be in ReadState.Initial. + //It will make the first read call. + PackagingUtilities.PerformInitailReadAndVerifyEncoding(xmlReader); + + //If the reader.ReadState is ReadState.Initial, then XmlDocument with perform the + //first xmlReader.Read() and start loading from that node/tag. + //If the reader.ReadState is ReadState.Intermediate, then XmlDocument, will start + //loading from that location itself. + //Note: Since in the above method we perform only the first read and will have not + //moved the reader state further down in the markup, we should be okay, and + //xmlDocument.Load will load from the very begining as intended. + xmlDocument.Load(xmlReader); + + // W3C spec allows for Signature tag to appear as an island and inherently allows + // for multiple Signature tags within the same XML document. + // OPC restricts this to a single, root-level Signature tag. However, Signature + // tags are allowed to exist within the non-OPC Object tags within an OPC signature. + // This is common for XAdES signatures and must be explicitly allowed. + XmlNodeList nodeList = xmlDocument.ChildNodes; + if (nodeList == null || nodeList.Count == 0 || nodeList.Count > 2) + throw new XmlException(SR.Get(SRID.PackageSignatureCorruption)); + + XmlNode node = nodeList[0]; + if (nodeList.Count == 2) + { + // First node must be the XmlDeclaration + if (nodeList[0].NodeType != XmlNodeType.XmlDeclaration) + throw new XmlException(SR.Get(SRID.PackageSignatureCorruption)); + + // Second node must be in the w3c namespace, and must be the tag + node = nodeList[1]; + } + + if ((node.NodeType != XmlNodeType.Element) || + (String.CompareOrdinal(node.NamespaceURI, SignedXml.XmlDsigNamespaceUrl) != 0) || + (String.CompareOrdinal(node.LocalName, XTable.Get(XTable.ID.SignatureTagName)) != 0)) + { + throw new XmlException(SR.Get(SRID.PackageSignatureCorruption)); + } + + // instantiate the SignedXml from the xmlDoc + _signedXml.LoadXml((XmlElement)node); + } + } + } + + // As per the OPC spec, only two Canonicalization methods can be specified + if (!IsValidXmlCanonicalizationTransform(_signedXml.SignedInfo.CanonicalizationMethod)) + throw new XmlException(SR.Get(SRID.UnsupportedCanonicalizationMethod)); + + // As per OPC spec, signature ID must be NCName + if (_signedXml.Signature.Id != null) + { + try + { + System.Xml.XmlConvert.VerifyNCName(_signedXml.Signature.Id); + } + catch (System.Xml.XmlException) + { + throw new XmlException(SR.Get(SRID.PackageSignatureCorruption)); + } + } + + return _signedXml; + } + + //------------------------------------------------------ + // + // Private Methods + // + //------------------------------------------------------ + + /// + /// Constructor - called from public constructor as well as static Sign() method + /// + /// current DigitalSignatureManager + /// the part that will/does house the associated XML signature + private XmlDigitalSignatureProcessor(PackageDigitalSignatureManager manager, + PackagePart signaturePart) + { + Invariant.Assert(manager != null); + Invariant.Assert(signaturePart != null); + + _signaturePart = signaturePart; + _manager = manager; + _lookForEmbeddedCert = true; + } + + /// + /// Create a new PackageDigitalSignature + /// + /// the data being protected by this signature + /// possibly null collection of relationshipSelectors that represent the + /// relationships that are to be signed + /// Identity of the author + /// Id attribute of the new Xml Signature + /// true if caller wants certificate embedded in the signature itself + /// references + /// objects to sign + private PackageDigitalSignature Sign( + IEnumerable parts, + IEnumerable relationshipSelectors, + X509Certificate2 signer, + String signatureId, + bool embedCertificate, + IEnumerable signatureObjects, + IEnumerable objectReferences) + { + // don't overwrite +#if DEBUG + using (Stream stream = SignaturePart.GetStream()) + { + Debug.Assert(stream.Length == 0, "Logic Error: Can't sign when signature already exists"); + } +#endif + + // grab hash algorithm as this may change in the future + _hashAlgorithmName = _manager.HashAlgorithm; + + // keep the signer if indicated + if (_manager.CertificateOption == CertificateEmbeddingOption.NotEmbedded) + _lookForEmbeddedCert = false; // don't bother parsing + else + _certificate = signer; // save some parsing + + // we only release this key if we obtain it + AsymmetricAlgorithm key = null; + if (signer.HasPrivateKey) + { + key = GetPrivateKey(signer); + } + else + { + key = GetPrivateKeyForSigning(signer); + } + + try + { + _signedXml = new CustomSignedXml(); + _signedXml.SigningKey = key; + _signedXml.Signature.Id = signatureId; + + if (BaseCompatibilityPreferences.MatchPackageSignatureMethodToPackagePartDigestMethod) + { + // Defaulting to SHA1 for key signing is counter-productive if the hash algorithm + // for the rest of the package is more secure. So if we have a selected hash + // algorithm in the PackageDigitalSignatureManager that is more secure, then + // select an equivalent level algorithm for key signing. + _signedXml.SignedInfo.SignatureMethod = SelectSignatureMethod(key); + } + + // Track if we are matching the signature method in order to retry on failure + bool usingMatchingSignatureMethod = _signedXml.SignedInfo.SignatureMethod != null; + + // put it in the XML + if (embedCertificate) + { + _signedXml.KeyInfo = GenerateKeyInfo(key, signer); + } + + // Package object tag + // convert from string to class and ensure we dispose + using (HashAlgorithm hashAlgorithm = GetHashAlgorithm(_hashAlgorithmName)) + { + // inform caller if hash algorithm is unknown + if (hashAlgorithm == null) + throw new InvalidOperationException(SR.Get(SRID.UnsupportedHashAlgorithm)); + + _signedXml.AddObject(GenerateObjectTag(hashAlgorithm, parts, relationshipSelectors, signatureId)); + } + + // add reference from SignedInfo to Package object tag + Reference objectReference = new Reference(XTable.Get(XTable.ID.OpcLinkAttrValue)); + objectReference.Type = XTable.Get(XTable.ID.W3CSignatureNamespaceRoot) + "Object"; + objectReference.DigestMethod = _hashAlgorithmName; + _signedXml.AddReference(objectReference); + + // add any custom object tags + AddCustomObjectTags(signatureObjects, objectReferences); + + // compute the signature + SignedXml xmlSig = _signedXml; + + try + { + xmlSig.ComputeSignature(); + } + catch (CryptographicException) when (usingMatchingSignatureMethod) + { + // We've hit a state where System.Security is possibly missing the required updates to process the matched signature. + // Disable our matching and attempt to sign again with the default SignatureMethod + BaseCompatibilityPreferences.MatchPackageSignatureMethodToPackagePartDigestMethod = false; + xmlSig.SignedInfo.SignatureMethod = null; + xmlSig.ComputeSignature(); + } + + // persist + UpdatePartFromSignature(_signedXml.Signature); + } + finally + { + if (key != null) + ((IDisposable)key).Dispose(); + } + + // create the PackageDigitalSignature object + _signature = new PackageDigitalSignature(_manager, this); + return _signature; + } + + /// + /// Attempt to select a key signing method that matches the strength of the selected + /// hash algorithm in the PackageDigitalSignatureManager. + /// + /// If no algorithm was selected, defaults to SHA1. + /// + /// + /// DSA keys have no supported stronger signing solution and are always SHA1 signed. + /// + /// The key being used + /// The URI of the appropriate signing method + private string SelectSignatureMethod(AsymmetricAlgorithm key) + { + string signatureMethod = null; + + if (key is RSA) + { + _rsaSigMethodLookup.TryGetValue(_manager.HashAlgorithm, out signatureMethod); + } + + return signatureMethod; + } + + /// + /// Extracts the private key from the X509Certificate2 certificate + /// + /// certificate for which we are looking for the private key + /// returns the private key + private static AsymmetricAlgorithm GetPrivateKey(X509Certificate2 cert) + { + // Adding support for CNG certificates. The default certificate template in Windows Server 2008+ is CNG + // Get[Algorithm]PrivateKey methods returns unique object while PrivateKey property returns shared one + // Make sure to dispose the key if it is from Get[Algorithm]PrivateKey methods + AsymmetricAlgorithm key = cert.GetRSAPrivateKey(); + if (key != null) + return key; + + key = cert.GetDSAPrivateKey(); + if (key != null) + return key; + + key = cert.GetECDsaPrivateKey(); + if (key != null) + return key; + + // Get[Algorithm]PrivateKey methods would always have returned the private key if the PrivateKey property would + // But Get[Algorithm]PrivateKey methods never throw but returns null in case of error during cryptographic operations + // But we want exception to be thrown when an error occurs during a cryptographic operation so that we can revert the changes + return cert.PrivateKey; + } + + /// + /// Assembles the sorted list of relationships for this part entry and + /// generates a stream with the Xml-equivalent as defined in the Opc spec + /// + /// relationship-type part entry + /// + private Stream GetRelationshipStream(PartManifestEntry partEntry) + { + Debug.Assert(partEntry.IsRelationshipEntry); + + //Get the list of relationships from the RelationshipSelectors for this part + SortedDictionary partRelationships = + new SortedDictionary(StringComparer.Ordinal); + foreach (System.IO.Packaging.PackageRelationshipSelector relationshipSelector in partEntry.RelationshipSelectors) + { + foreach (System.IO.Packaging.PackageRelationship r in relationshipSelector.Select(_manager.Package)) + { + if(!partRelationships.ContainsKey(r.Id)) + partRelationships.Add(r.Id, r); + } + } + + return GenerateRelationshipNodeStream(partRelationships.Values); + } + + private void AddCustomObjectTags(IEnumerable signatureObjects, + IEnumerable objectReferences) + { + Invariant.Assert(_signedXml != null); + + + // add any references + if (objectReferences != null) + { + // Validate the Reference tags in the SignedInfo as per the + // restrictions imposed by the OPC spec + ValidateReferences(objectReferences, false /*allowPackageSpecificReference*/); + + foreach (Reference reference in objectReferences) + { + // consistent hash algorithm for entire signature + reference.DigestMethod = _hashAlgorithmName; + _signedXml.AddReference(reference); + } + } + + // any object tags + if (signatureObjects != null) + { + // thes have been pre-screened for matches against reserved OpcAttrValue and duplicates + foreach (DataObject obj in signatureObjects) + { + _signedXml.AddObject(obj); + } + } + } + + private void UpdatePartFromSignature(Signature sig) + { + // write to stream + using (Stream s = SignaturePart.GetStream(FileMode.Create, FileAccess.Write)) + { + using (XmlTextWriter xWriter = new XmlTextWriter(s, System.Text.Encoding.UTF8)) + { + xWriter.WriteStartDocument(true); + sig.GetXml().WriteTo(xWriter); + xWriter.WriteEndDocument(); + } + } + _signedXml = null; // force a re-parse + } + + private static byte[] HashStream(HashAlgorithm hashAlgorithm, Stream s) + { + s.Seek(0, SeekOrigin.Begin); + + // reset algorithm + hashAlgorithm.Initialize(); + return hashAlgorithm.ComputeHash(s); + } + + private static Stream TransformXml(Transform xForm, Object source) + { + // transform + xForm.LoadInput(source); + + return (Stream)xForm.GetOutput(); + } + + /// + /// Full parse of the Package-specific Object tag + /// + /// Side effect of updating _signingTime, _signingTimeFormat, + /// _partManifest, _partEntryManifest and _relationshipManifest + /// throws if markup does not match OPC spec + private void ParsePackageDataObject() + { + if (!_dataObjectParsed) + { + EnsureXmlSignatureParsed(); + + // find the package-specific Object tag + XmlNodeList nodeList = GetPackageDataObject().Data; + + // The legal parent is a "Package" Object tag with 2 children + // and + if (nodeList.Count != 2) + throw new XmlException(SR.Get(SRID.XmlSignatureParseError)); + + // get a NodeReader that allows us to easily and correctly skip comments + XmlReader reader = new XmlNodeReader(nodeList[0].ParentNode); + + // parse the tag - ensure that it is in the correct namespace + reader.Read(); // enter the Object tag + if (String.CompareOrdinal(reader.NamespaceURI, SignedXml.XmlDsigNamespaceUrl) != 0) + throw new XmlException(SR.Get(SRID.XmlSignatureParseError)); + + string signaturePropertiesTagName = XTable.Get(XTable.ID.SignaturePropertiesTagName); + string manifestTagName = XTable.Get(XTable.ID.ManifestTagName); + bool signaturePropertiesTagFound = false; + bool manifestTagFound = false; + while (reader.Read() && (reader.NodeType == XmlNodeType.Element)) + { + if (reader.MoveToContent() == XmlNodeType.Element + && (String.CompareOrdinal(reader.NamespaceURI, SignedXml.XmlDsigNamespaceUrl) == 0) + && reader.Depth == 1) + { + if (!signaturePropertiesTagFound && String.CompareOrdinal(reader.LocalName, signaturePropertiesTagName) == 0) + { + signaturePropertiesTagFound = true; + + // parse the tag + _signingTime = XmlSignatureProperties.ParseSigningTime( + reader, _signedXml.Signature.Id, out _signingTimeFormat); + + continue; + } + else if (!manifestTagFound && String.CompareOrdinal(reader.LocalName, manifestTagName) == 0) + { + manifestTagFound = true; + + // parse the tag + XmlSignatureManifest.ParseManifest(_manager, reader, + out _partManifest, out _partEntryManifest, out _relationshipManifest); + + continue; + } + } + + throw new XmlException(SR.Get(SRID.XmlSignatureParseError)); + } + + // these must both exist on exit + if (!(signaturePropertiesTagFound && manifestTagFound)) + throw new XmlException(SR.Get(SRID.XmlSignatureParseError)); + + _dataObjectParsed = true; + } + } + + /// + /// Finds and return the package-specific Object tag + /// + /// + private DataObject GetPackageDataObject() + { + EnsureXmlSignatureParsed(); + + // look for the Package-specific object tag + String opcId = XTable.Get(XTable.ID.OpcAttrValue); + DataObject returnValue = null; + foreach (DataObject dataObject in _signedXml.Signature.ObjectList) + { + if (String.CompareOrdinal(dataObject.Id, opcId) == 0) + { + // duplicates not allowed + if (returnValue != null) + throw new XmlException(SR.Get(SRID.SignatureObjectIdMustBeUnique)); + + returnValue = dataObject; + } + } + + // Package object tag required + if (returnValue != null) + return returnValue; + else + throw new XmlException(SR.Get(SRID.PackageSignatureObjectTagRequired)); + } + + private KeyInfo GenerateKeyInfo(AsymmetricAlgorithm key, X509Certificate2 signer) + { + // KeyInfo section + KeyInfo keyInfo = new KeyInfo(); + KeyInfoName keyInfoName = new KeyInfoName(); + keyInfoName.Value = signer.Subject; + keyInfo.AddClause(keyInfoName); // human readable Principal name + + // Include the public key information (if we are familiar with the algorithm type) + if (key is RSA) + keyInfo.AddClause(new RSAKeyValue((RSA)key)); // RSA key parameters + else + { + if (key is DSA) + keyInfo.AddClause(new DSAKeyValue((DSA)key)); // DSA + else + throw new ArgumentException(SR.Get(SRID.CertificateKeyTypeNotSupported), "signer"); + } + + // the actual X509 cert + keyInfo.AddClause(new KeyInfoX509Data(signer)); + + return keyInfo; + } + + private DataObject GenerateObjectTag( + HashAlgorithm hashAlgorithm, + IEnumerable parts, IEnumerable relationshipSelectors, + String signatureId) + { + XmlDocument xDoc = new XmlDocument(); + xDoc.AppendChild(xDoc.CreateNode(XmlNodeType.Element, "root", "namespace")); // dummy root + xDoc.DocumentElement.AppendChild(XmlSignatureManifest.GenerateManifest(_manager, xDoc, hashAlgorithm, parts, relationshipSelectors)); + xDoc.DocumentElement.AppendChild(XmlSignatureProperties.AssembleSignatureProperties(xDoc, DateTime.Now, _manager.TimeFormat, signatureId)); + + DataObject dataObject = new DataObject(); + dataObject.Data = xDoc.DocumentElement.ChildNodes; + dataObject.Id = XTable.Get(XTable.ID.OpcAttrValue); + + return dataObject; + } + + /// + /// lookup the private key using the given identity + /// + /// X509Cert + /// IDisposable asymmetric algorithm that serves as a proxy to the private key. Caller must dispose + /// of properly. + private static AsymmetricAlgorithm GetPrivateKeyForSigning(X509Certificate2 signer) + { + // if the certificate does not actually contain the key, we need to look it up via ThumbPrint + Invariant.Assert(!signer.HasPrivateKey); + + // look for appropriate certificates + X509Store store = new X509Store(StoreLocation.CurrentUser); + + try + { + store.Open(OpenFlags.OpenExistingOnly | OpenFlags.ReadOnly); + + X509Certificate2Collection collection = (X509Certificate2Collection)store.Certificates; + + collection = collection.Find(X509FindType.FindByThumbprint, signer.Thumbprint, true); + if (collection.Count > 0) + { + if (collection.Count > 1) + throw new CryptographicException(SR.Get(SRID.DigSigDuplicateCertificate)); + + signer = collection[0]; + } + else + throw new CryptographicException(SR.Get(SRID.DigSigCannotLocateCertificate)); + } + finally + { + store.Close(); + } + + // get the corresponding AsymmetricAlgorithm + return GetPrivateKey(signer); + } + + + /// + /// This method validated the Reference tags as per the restrictions imposed + /// by the OPC spec. + /// NOTE: The same method is called from Verify and Sign methods. At verify time we need to make sure + /// that there is exactly one Package-specific reference. At Sign time we need to make sure that + /// there are no package-specific references in the list of references passed to Sign APIs as a + /// input parameter, since we will be generating Package-specific object. + /// + /// list of references to be validated + /// When "true", we check to make sure that there is + /// exactly one package-specific reference and when "false", we do not allow any package-specific + /// references + private void ValidateReferences(IEnumerable references, bool allowPackageSpecificReferences) + { + Debug.Assert(references != null); + + bool packageReferenceFound = false; + TransformChain currentTransformChain; + + foreach (Reference currentReference in references) + { + //As per the OPC spec, Uri attribute in Reference elements MUST refer using fragment identifiers + //This implies that Uri cannot be absolute. + if (currentReference.Uri.StartsWith("#", StringComparison.Ordinal)) + { + //As per the OPC spec, there MUST be exactly one package specific reference to the + //package specific element + if (String.CompareOrdinal(currentReference.Uri, XTable.Get(XTable.ID.OpcLinkAttrValue)) == 0) + { + if (!allowPackageSpecificReferences) + throw new ArgumentException(SR.Get(SRID.PackageSpecificReferenceTagMustBeUnique)); + + //If there are more than one package specific tags + if (packageReferenceFound == true) + throw new XmlException(SR.Get(SRID.MoreThanOnePackageSpecificReference)); + else + packageReferenceFound = true; + } + + currentTransformChain = currentReference.TransformChain; + + for(int j=0; j _partManifest; // signed parts (suitable for return to public API) + private List _partEntryManifest; // signed parts (with extra info) + private List _relationshipManifest; // signed relationship selectors + + private static readonly ContentType _xmlSignaturePartType + = new ContentType("application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml"); + + /// + /// Mapping from hash algorithms in the PackageDigitalSignatureManager to RSA key signing methods. + /// + private static readonly Dictionary _rsaSigMethodLookup = new Dictionary(StringComparer.OrdinalIgnoreCase) + { + { "http://www.w3.org/2001/04/xmlenc#sha256", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" }, + { "http://www.w3.org/2001/04/xmldsig-more#sha384", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" }, + { "http://www.w3.org/2001/04/xmlenc#sha512", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" }, + }; + } +} + From a98973dde1bfad2b59cf461a80ca623ecb368841 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2019 19:55:21 +0000 Subject: [PATCH 130/227] [master] Update dependencies from dotnet/winforms (#1304) * Update dependencies from https://github.com/dotnet/winforms build 20190717.5 - Microsoft.Private.Winforms - 4.8.0-preview8.19367.5 * Update dependencies from https://github.com/dotnet/winforms build 20190718.1 - Microsoft.Private.Winforms - 4.8.0-preview8.19368.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8dff00eda15..59b52e01ffa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 7edae7ad900a7381652c257d9410b2f04795e846 + 45869505ac61c1dfb6d9ae982c945ce2e75a6e0c diff --git a/eng/Versions.props b/eng/Versions.props index 5aaa8b34ca9..0cc2181ceaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19367.4 + 4.8.0-preview8.19368.1 From 2f77a05cbd5642da3c42c8e6af5dc94a1484aa7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2019 20:23:41 +0000 Subject: [PATCH 131/227] [master] Update dependencies from dotnet/winforms (#1309) * Update dependencies from https://github.com/dotnet/winforms build 20190718.3 - Microsoft.Private.Winforms - 4.8.0-preview8.19368.3 * Update dependencies from https://github.com/dotnet/winforms build 20190718.2 - Microsoft.Private.Winforms - 4.8.0-preview8.19368.2 * Update dependencies from https://github.com/dotnet/winforms build 20190718.4 - Microsoft.Private.Winforms - 4.8.0-preview8.19368.4 * Update dependencies from https://github.com/dotnet/winforms build 20190718.5 - Microsoft.Private.Winforms - 4.8.0-preview8.19368.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59b52e01ffa..53a266819df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 45869505ac61c1dfb6d9ae982c945ce2e75a6e0c + 8289297222d08d8768713cceb167f7e138bc6cdf diff --git a/eng/Versions.props b/eng/Versions.props index 0cc2181ceaa..3a73293fb0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19368.1 + 4.8.0-preview8.19368.5 From 580a4283fffd4b0523ecee02cb22997122d6708f Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Thu, 18 Jul 2019 15:34:40 -0700 Subject: [PATCH 132/227] Move builds to BuildPool, project-appropriate machines (#1310) --- eng/pipeline.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eng/pipeline.yml b/eng/pipeline.yml index d69eed437ce..ab7baa07b54 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -4,10 +4,6 @@ # parameters: - # Needed because agent pool can't be read from a user-defined variable (Azure DevOps limitation) - # Defaults to dotnet-internal-vs2019-preview - agentPool: dotnet-internal-vs2019-preview - # Needed because runAsPublic is used in template expressions, which can't read from user-defined variables # Defaults to true runAsPublic: true @@ -27,7 +23,15 @@ jobs: jobs: - job: Windows_NT timeoutInMinutes: 120 # how long to run the job before automatically cancelling; see https://github.com/dotnet/wpf/issues/952 - pool: ${{ parameters.agentPool }} + pool: + # For public or PR jobs, use the hosted pool. For internal jobs use the internal pool. + # Will eventually change this to two BYOC pools. + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + name: NetCorePublic-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + name: NetCoreInternal-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre variables: # needed for signing - name: _TeamName From 1c8684df0a96a68d29d518a53f7eca521c3a2a5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2019 05:28:25 +0000 Subject: [PATCH 133/227] Update dependencies from https://github.com/dotnet/arcade build 20190718.7 (#1313) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19368.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19368.7 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19368.7 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19368.7 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19368.7 --- eng/Version.Details.xml | 20 ++--- eng/Versions.props | 6 +- eng/common/init-tools-native.sh | 2 +- eng/common/pipeline-logging-functions.sh | 82 +++++++++++++++++-- .../channels/internal-servicing.yml | 1 + .../post-build/channels/public-release.yml | 1 + eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 19 ++--- global.json | 4 +- 9 files changed, 103 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53a266819df..f9a421be654 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup fbe24089c59a9f330dfb7c4db4ae97a293685510 - + https://github.com/dotnet/arcade - 0dd5e2025f0049c133a8706f40e4463b193e5d17 + eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d - + https://github.com/dotnet/arcade - 0dd5e2025f0049c133a8706f40e4463b193e5d17 + eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 556b874e22a9580b511976056cf9aa664a6ad8c1 - + https://github.com/dotnet/arcade - 0dd5e2025f0049c133a8706f40e4463b193e5d17 + eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d - + https://github.com/dotnet/arcade - 0dd5e2025f0049c133a8706f40e4463b193e5d17 + eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d - + https://github.com/dotnet/arcade - 0dd5e2025f0049c133a8706f40e4463b193e5d17 + eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d diff --git a/eng/Versions.props b/eng/Versions.props index 3a73293fb0e..3016213a598 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19366.4 - 1.0.0-beta.19366.4 - 1.0.0-beta.19366.4 + 1.0.0-beta.19368.7 + 1.0.0-beta.19368.7 + 1.0.0-beta.19368.7 diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index fc72d13948e..5f2e77f448b 100644 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -71,7 +71,7 @@ function ReadGlobalJsonNativeTools { local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}') native_tools_list=${native_tools_list//[\" ]/} native_tools_list=${native_tools_list//,/$'\n'} - native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[:space:]')" + native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[[:space:]]')" local old_IFS=$IFS while read -r line; do diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh index 6098f9a5438..1c560a50613 100644 --- a/eng/common/pipeline-logging-functions.sh +++ b/eng/common/pipeline-logging-functions.sh @@ -39,11 +39,11 @@ function Write-PipelineTaskError { return fi - message_type="error" - sourcepath='' - linenumber='' - columnnumber='' - error_code='' + local message_type="error" + local sourcepath='' + local linenumber='' + local columnnumber='' + local error_code='' while [[ $# -gt 0 ]]; do opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" @@ -76,7 +76,7 @@ function Write-PipelineTaskError { shift done - message="##vso[task.logissue" + local message="##vso[task.logissue" message="$message type=$message_type" @@ -100,3 +100,73 @@ function Write-PipelineTaskError { echo "$message" } +function Write-PipelineSetVariable { + if [[ "$ci" != true ]]; then + return + fi + + local name='' + local value='' + local secret=false + local as_output=false + local is_multi_job_variable=true + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -name|-n) + name=$2 + shift + ;; + -value|-v) + value=$2 + shift + ;; + -secret|-s) + secret=true + ;; + -as_output|-a) + as_output=true + ;; + -is_multi_job_variable|-i) + is_multi_job_variable=$2 + shift + ;; + esac + shift + done + + value=${value/;/%3B} + value=${value/\\r/%0D} + value=${value/\\n/%0A} + value=${value/]/%5D} + + local message="##vso[task.setvariable variable=$name;isSecret=$secret;isOutput=$is_multi_job_variable]$value" + + if [[ "$as_output" == true ]]; then + $message + else + echo "$message" + fi +} + +function Write-PipelinePrependPath { + local prepend_path='' + + while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -path|-p) + prepend_path=$2 + shift + ;; + esac + shift + done + + export PATH="$prepend_path:$PATH" + + if [[ "$ci" == true ]]; then + echo "##vso[task.prependpath]$prepend_path" + fi +} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml index 50ad724fc0c..648e854e0ed 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -84,6 +84,7 @@ stages: /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) + /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml index 574cb1c2b92..f6a7efdfe9d 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -84,6 +84,7 @@ stages: /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) + /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9abaac015fb..8fe2b11ad21 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -169,7 +169,7 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { $installScript = GetDotNetInstallScript $dotnetRoot +function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 70d92cf85aa..0deb01c480b 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -146,14 +146,10 @@ function InitializeDotNetCli { # Add dotnet to PATH. This prevents any bare invocation of dotnet in custom # build steps from using anything other than what we've downloaded. - export PATH="$dotnet_root:$PATH" + Write-PipelinePrependPath -path "$dotnet_root" - if [[ $ci == true ]]; then - # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build - echo "##vso[task.prependpath]$dotnet_root" - echo "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0" - echo "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1" - fi + Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" + Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" # return value _InitializeDotNetCli="$dotnet_root" @@ -387,7 +383,8 @@ mkdir -p "$toolset_dir" mkdir -p "$temp_dir" mkdir -p "$log_dir" -if [[ $ci == true ]]; then - export TEMP="$temp_dir" - export TMP="$temp_dir" -fi +Write-PipelineSetVariable -name "Artifacts" -value "$artifacts_dir" +Write-PipelineSetVariable -name "Artifacts.Toolset" -value "$toolset_dir" +Write-PipelineSetVariable -name "Artifacts.Log" -value "$log_dir" +Write-PipelineSetVariable -name "Temp" -value "$temp_dir" +Write-PipelineSetVariable -name "TMP" -value "$temp_dir" diff --git a/global.json b/global.json index e90aafeade3..c1bfa2c9677 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19366.4", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19366.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19368.7", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19368.7" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 3d11d6cf0e1444b183d7cd29739079223eacd6d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2019 09:51:01 +0000 Subject: [PATCH 134/227] Update dependencies from https://github.com/dotnet/winforms build 20190719.1 (#1315) - Microsoft.Private.Winforms - 4.8.0-preview8.19369.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9a421be654..353de022a9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 8289297222d08d8768713cceb167f7e138bc6cdf + bb120ec186d3688ae65cabc12f6082cbd2baf5a6 diff --git a/eng/Versions.props b/eng/Versions.props index 3016213a598..a55995d8f33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19368.5 + 4.8.0-preview8.19369.1 From 9c4c4f9b44ffa1a1582bba7492e1e60a2a300ab4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2019 14:11:40 +0000 Subject: [PATCH 135/227] [master] Update dependencies from dotnet/winforms (#1316) * Update dependencies from https://github.com/dotnet/winforms build 20190719.2 - Microsoft.Private.Winforms - 4.8.0-preview8.19369.2 * Update dependencies from https://github.com/dotnet/winforms build 20190719.3 - Microsoft.Private.Winforms - 4.8.0-preview8.19369.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 353de022a9b..8f1be084977 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - bb120ec186d3688ae65cabc12f6082cbd2baf5a6 + aa97040e3fff07dd8e1e8e3066d920bd5bac0f55 diff --git a/eng/Versions.props b/eng/Versions.props index a55995d8f33..282869a3916 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19369.1 + 4.8.0-preview8.19369.3 From ded9e2b4f26f52bb190e5ee83df7d4a1deca05a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2019 14:46:20 +0000 Subject: [PATCH 136/227] Update dependencies from https://github.com/dotnet/winforms build 20190719.4 (#1317) - Microsoft.Private.Winforms - 4.8.0-preview8.19369.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f1be084977..3301110bf07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - aa97040e3fff07dd8e1e8e3066d920bd5bac0f55 + 7e91fff7eac60a7ab2cb5d18fb0dc2eb2d249e9e diff --git a/eng/Versions.props b/eng/Versions.props index 282869a3916..cdb5e2d072c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19369.3 + 4.8.0-preview8.19369.4 From a8b99d276bfbddff83a9e4af049c62943a7d3e3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2019 15:16:12 +0000 Subject: [PATCH 137/227] Update dependencies from https://github.com/dotnet/winforms build 20190719.5 (#1318) - Microsoft.Private.Winforms - 4.8.0-preview8.19369.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3301110bf07..fca3ce04f61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 7e91fff7eac60a7ab2cb5d18fb0dc2eb2d249e9e + b038ebe04f4d0079ed0a5b758a480a8be623fefc diff --git a/eng/Versions.props b/eng/Versions.props index cdb5e2d072c..6a40626219f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19369.4 + 4.8.0-preview8.19369.5 From a02989f268102c4d6f16950d122bf5095b7d7c68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2019 16:46:19 +0000 Subject: [PATCH 138/227] Update dependencies from https://github.com/dotnet/winforms build 20190719.6 (#1319) - Microsoft.Private.Winforms - 4.8.0-preview8.19369.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fca3ce04f61..e8d727d901e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - b038ebe04f4d0079ed0a5b758a480a8be623fefc + ac0426561b158522eb8564de2bedd28f28148f8d diff --git a/eng/Versions.props b/eng/Versions.props index 6a40626219f..d71578af5a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19369.5 + 4.8.0-preview8.19369.6 From c08183de04139f578530f32bcb4e70b84138b646 Mon Sep 17 00:00:00 2001 From: Rob LaDuca Date: Fri, 19 Jul 2019 10:24:34 -0700 Subject: [PATCH 139/227] Convert non-seekable PackagePart streams to seekable (#1311) Create extension methods for PackagePart that allow us to acquire a seekable stream in the case where the stream returned from PackagePart.GetStream is not already seekable. Switch instances where we call PackagePart.GetStream to use this in order to work-around the fact that a read-only PackagePart stream will use DeflateStream, which is not seekable in .NET Core. --- .../System/IO/Packaging/PackWebResponse.cs | 5 +- .../MS/Internal/IO/Packaging/PackageFilter.cs | 4 +- .../System/Windows/Application.cs | 10 +-- .../System/Windows/Documents/WpfPayload.cs | 19 +++-- .../Windows/Documents/XamlToRtfWriter.cs | 17 ++-- .../IO/Packaging/PackagePartExtensions.cs | 85 +++++++++++++++++++ .../IO/Packaging/PackagingUtilities.cs | 10 +-- .../MS/Internal/IO/Packaging/Certificate.cs | 2 +- .../Packaging/XmlDigitalSignatureProcessor.cs | 6 +- .../IO/Packaging/XmlSignatureManifest.cs | 2 +- .../src/WindowsBase/WindowsBase.csproj | 1 + 11 files changed, 122 insertions(+), 39 deletions(-) create mode 100644 src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/IO/Packaging/PackagePartExtensions.cs diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebResponse.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebResponse.cs index 0ae910e7445..9cea47eebaa 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebResponse.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebResponse.cs @@ -250,7 +250,8 @@ public override Stream GetResponseStream() throw new WebException(SR.Get(SRID.WebResponsePartNotFound)); PackagePart p = c.GetPart(_partName); - Stream s = p.GetStream(FileMode.Open, FileAccess.Read); + + Stream s = p.GetSeekableStream(FileMode.Open, FileAccess.Read); _mimeType = new MS.Internal.ContentType(p.ContentType); // save this for use in ContentType property - may still be null _fullStreamLength = s.Length; // just this stream @@ -648,7 +649,7 @@ internal Stream GetResponseStream() System.Threading.Thread.CurrentThread.ManagedThreadId + ": " + "CachedResponse - Getting part stream "); #endif - Stream s = p.GetStream(FileMode.Open, FileAccess.Read); + Stream s = p.GetSeekableStream(FileMode.Open, FileAccess.Read); // Unless package is thread-safe, wrap the returned stream so that // package access is serialized diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/IO/Packaging/PackageFilter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/IO/Packaging/PackageFilter.cs index 2f68588d677..3c4888ac43b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/IO/Packaging/PackageFilter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/IO/Packaging/PackageFilter.cs @@ -378,7 +378,7 @@ IndexingFilterMarshaler corePropertiesFilterMarshaler _currentFilter = GetFilterFromClsid(new Guid(filterClsid)); if (_currentFilter != null) { - _currentStream = currentPart.GetStream(); + _currentStream = currentPart.GetSeekableStream(); ManagedIStream stream = new ManagedIStream(_currentStream); try { @@ -415,7 +415,7 @@ IndexingFilterMarshaler corePropertiesFilterMarshaler { if (_currentStream == null) { - _currentStream = currentPart.GetStream(); + _currentStream = currentPart.GetSeekableStream(); } IndexingFilterMarshaler xamlFilterMarshaler diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs index 7964f5d4455..0593bbdb3c4 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs @@ -445,7 +445,7 @@ public static void LoadComponent(Object component, Uri resourceLocator) // if not, this is a first time regular load of the component. PackagePart part = GetResourceOrContentPart(resourceLocator); ContentType contentType = new ContentType(part.ContentType); - stream = part.GetStream(); + stream = part.GetSeekableStream(); bCloseStream = true; // @@ -509,7 +509,7 @@ internal static object LoadComponent(Uri resourceLocator, bool bSkipJournaledPro PackagePart part = GetResourceOrContentPart(packUri); ContentType contentType = new ContentType(part.ContentType); - Stream stream = part.GetStream(); + Stream stream = part.GetSeekableStream(); ParserContext pc = new ParserContext(); pc.BaseUri = packUri; @@ -623,7 +623,7 @@ public static StreamResourceInfo GetResourceStream(Uri uriResource) } ResourcePart part = GetResourceOrContentPart(uriResource) as ResourcePart; - return (part == null) ? null : new StreamResourceInfo(part.GetStream(), part.ContentType); + return (part == null) ? null : new StreamResourceInfo(part.GetSeekableStream(), part.ContentType); } /// @@ -656,7 +656,7 @@ public static StreamResourceInfo GetContentStream(Uri uriContent) } ContentFilePart part = GetResourceOrContentPart(uriContent) as ContentFilePart; - return (part == null) ? null : new StreamResourceInfo(part.GetStream(), part.ContentType); + return (part == null) ? null : new StreamResourceInfo(part.GetSeekableStream(), part.ContentType); } /// @@ -714,7 +714,7 @@ public static StreamResourceInfo GetRemoteStream(Uri uriRemote) { try { - stream = sooPart.GetStream(); + stream = sooPart.GetSeekableStream(); if (stream == null) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/WpfPayload.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/WpfPayload.cs index 40a69e8a890..7627c4c9fc8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/WpfPayload.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/WpfPayload.cs @@ -21,6 +21,7 @@ namespace System.Windows.Documents { using MS.Internal; // Invariant + using MS.Internal.IO.Packaging; using System; using System.Xml; using System.Windows.Markup; // TypeConvertContext, ParserContext @@ -221,7 +222,7 @@ internal static string SaveRange(ITextRange range, ref Stream stream, bool useFl PackagePart xamlEntryPart = wpfPayload.CreateWpfEntryPart(); // Write the part's content - Stream xamlPartStream = xamlEntryPart.GetStream(); + Stream xamlPartStream = xamlEntryPart.GetSeekableStream(); using (xamlPartStream) { StreamWriter xamlPartWriter = new StreamWriter(xamlPartStream); @@ -261,7 +262,7 @@ internal static MemoryStream SaveImage(BitmapSource bitmapSource, string imageCo PackagePart xamlEntryPart = wpfPayload.CreateWpfEntryPart(); // Write the part's content - Stream xamlPartStream = xamlEntryPart.GetStream(); + Stream xamlPartStream = xamlEntryPart.GetSeekableStream(); using (xamlPartStream) { StreamWriter xamlPartWriter = new StreamWriter(xamlPartStream); @@ -334,8 +335,8 @@ internal static object LoadElement(Stream stream) // Uniqueness is required to make sure that cached images are not mixed up. int newWpfPayoutCount = Interlocked.Increment(ref _wpfPayloadCount); Uri payloadUri = new Uri("payload://wpf" + newWpfPayoutCount, UriKind.Absolute); - Uri entryPartUri = PackUriHelper.Create(payloadUri, xamlEntryPart.Uri); // gives an absolute uri of the entry part - Uri packageUri = PackUriHelper.GetPackageUri(entryPartUri); // extracts package uri from combined package+part uri + Uri entryPartUri = System.IO.Packaging.PackUriHelper.Create(payloadUri, xamlEntryPart.Uri); // gives an absolute uri of the entry part + Uri packageUri = System.IO.Packaging.PackUriHelper.GetPackageUri(entryPartUri); // extracts package uri from combined package+part uri PackageStore.AddPackage(packageUri, wpfPayload.Package); // Register the package // Set this temporary uri as a base uri for xaml parser @@ -344,7 +345,7 @@ internal static object LoadElement(Stream stream) // Call xaml parser bool useRestrictiveXamlReader = !Clipboard.UseLegacyDangerousClipboardDeserializationMode(); - xamlObject = XamlReader.Load(xamlEntryPart.GetStream(), parserContext, useRestrictiveXamlReader); + xamlObject = XamlReader.Load(xamlEntryPart.GetSeekableStream(), parserContext, useRestrictiveXamlReader); // Remove the temporary uri from the PackageStore PackageStore.RemovePackage(packageUri); @@ -484,7 +485,7 @@ private void CreateImagePart(PackagePart sourcePart, BitmapSource imageSource, s bitmapEncoder.Frames.Add(BitmapFrame.Create(imageSource)); // Save encoded image data into the image part in the package - Stream imageStream = imagePart.GetStream(); + Stream imageStream = imagePart.GetSeekableStream(); using (imageStream) { bitmapEncoder.Save(imageStream); @@ -692,7 +693,7 @@ internal Stream CreateXamlStream() PackagePart part = this.CreateWpfEntryPart(); // Return a stream opened for writing an image data - return part.GetStream(); + return part.GetSeekableStream(); } internal Stream CreateImageStream(int imageCount, string contentType, out string imagePartUriString) @@ -714,7 +715,7 @@ internal Stream CreateImageStream(int imageCount, string contentType, out string imagePartUriString = GetImageReference(imagePartUriString); // Return a stream opened for writing an image data - return imagePart.GetStream(); + return imagePart.GetSeekableStream(); } internal Stream GetImageStream(string imageSourceString) @@ -723,7 +724,7 @@ internal Stream GetImageStream(string imageSourceString) imageSourceString = imageSourceString.Substring(1); // cut the leading dot out Uri imagePartUri = new Uri(XamlPayloadDirectory + imageSourceString, UriKind.Relative); PackagePart imagePart = _package.GetPart(imagePartUri); - return imagePart.GetStream(); + return imagePart.GetSeekableStream(); } // ------------------------------------------------------------- diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs index 615130cb0e4..f1238c48fa2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/XamlToRtfWriter.cs @@ -2019,18 +2019,13 @@ private void WriteImage(DocumentNode documentNode) // Read the image binary data from WpfPayLoad that contains Xaml and Images. // Xaml content have the image source like as "./Image1.png" so that we can // query the image from the container of WpfPayLoad with the image source name. - Stream imageStream = _wpfPayload.GetImageStream(documentNode.FormatState.ImageSource); - - // Get image type to be added to rtf content - RtfImageFormat imageFormat = GetImageFormatFromImageSourceName(documentNode.FormatState.ImageSource); - - // Write the shape image like as "\pngblip" or "\jpegblip" rtf control. We wrap the stream that comes - // from the package because we require the stream to be seekable. - Debug.Assert(!imageStream.CanSeek); - using (var seekableStream = new MemoryStream((int)imageStream.Length)) + using (Stream imageStream = _wpfPayload.GetImageStream(documentNode.FormatState.ImageSource)) { - imageStream.CopyTo(seekableStream); - WriteShapeImage(documentNode, seekableStream, imageFormat); + // Get image type to be added to rtf content + RtfImageFormat imageFormat = GetImageFormatFromImageSourceName(documentNode.FormatState.ImageSource); + + // Write the shape image like as "\pngblip" or "\jpegblip" rtf control. + WriteShapeImage(documentNode, imageStream, imageFormat); } #if WindowsMetaFile diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/IO/Packaging/PackagePartExtensions.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/IO/Packaging/PackagePartExtensions.cs new file mode 100644 index 00000000000..fa371aa3589 --- /dev/null +++ b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/IO/Packaging/PackagePartExtensions.cs @@ -0,0 +1,85 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using MS.Internal.WindowsBase; +using System.IO; +using System.IO.Packaging; + +namespace MS.Internal.IO.Packaging +{ + /// + /// Extensions to provide wrappers for functionality that no longer exists in System.IO.Packaging.PackagePart + /// + [FriendAccessAllowed] + internal static class PackagePartExtensions + { + /// + /// Gets a seekable stream from the PackagePart. + /// for details. + /// + /// + /// A seekable stream representing the data in the PackagePart. + internal static Stream GetSeekableStream(this PackagePart packPart) + { + return GetSeekableStream(packPart, FileMode.OpenOrCreate, packPart.Package.FileOpenAccess); + } + + /// + /// Gets a seekable stream from the PackagePart. + /// for details. + /// + /// + /// The FileMode to open the PackagePart + /// A seekable stream representing the data in the PackagePart. + internal static Stream GetSeekableStream(this PackagePart packPart, FileMode mode) + { + return GetSeekableStream(packPart, mode, packPart.Package.FileOpenAccess); + } + + /// + /// Gets a seekable stream from the PackagePart. + /// + /// + /// In .NET Core 3.0, System.IO.Packaging was removed, in part, from WPF. WPF now uses the implementation + /// contained in System.IO.Packaging.dll. This implementation has distinct differences from the .NET Framework + /// WPF implementation. One such difference is that the returned by calls + /// when the is opened read-only is not a seekable stream. This breaks several assumptions in WPF + /// and causes crashes when various parts of the code-base call into or . + /// + /// To fix this, we read the entire into a , allowing callers to fully seek the stream. + /// This is, generally, what would be the case in .NET Framework. + /// + /// Note that if the stream returned is seekable (the was opened write or read-write) then we just pass the resulting + /// stream back as we're already guaranteed it meets our needs. + /// + /// + /// The FileMode to open the PackagePart + /// The FileAccess used to open the PackagePart + /// A seekable stream representing the data in the PackagePart. + internal static Stream GetSeekableStream(this PackagePart packPart, FileMode mode, FileAccess access) + { + var packStream = packPart.GetStream(mode, access); + + // If the stream returned is seekable it meets all requirements and can be used directly. + if (packStream.CanSeek) + { + return packStream; + } + + // Non-seekable streams need to be copied out into memory so they are seekable. + using (packStream) + { + var seekableStream = new MemoryStream((int)packStream.Length); + + packStream.CopyTo(seekableStream); + + // Reset the stream to the beginning. If this is not done, attempts to read the stream + // from the current position will fail. E.G. XAML/XML parsing. + seekableStream.Position = 0; + + return seekableStream; + } + } + } +} diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/IO/Packaging/PackagingUtilities.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/IO/Packaging/PackagingUtilities.cs index d030be45606..d7e5bad4189 100644 --- a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/IO/Packaging/PackagingUtilities.cs +++ b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/IO/Packaging/PackagingUtilities.cs @@ -626,7 +626,7 @@ protected override void Dispose(bool disposing) //------------------------------------------------------ private string _path; private ReliableIsolatedStorageFileFolder _folder; - private bool _disposed; + private bool _disposed; } @@ -820,9 +820,9 @@ void CheckDisposed() // //------------------------------------------------------ private static IsolatedStorageFile _file; - private static bool _userHasProfile; - private int _refCount; // number of outstanding "streams" - private bool _disposed; + private static bool _userHasProfile; + private int _refCount; // number of outstanding "streams" + private bool _disposed; } //------------------------------------------------------ @@ -835,7 +835,7 @@ void CheckDisposed() /// /// See PS 1468964 for details. private static Object _isoStoreSyncObject = new Object(); - private static Object _isolatedStorageFileLock = new Object(); + private static Object _isolatedStorageFileLock = new Object(); private static ReliableIsolatedStorageFileFolder _defaultFile; private const string XmlNamespace = "xmlns"; private const string _encodingAttribute = "encoding"; diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Certificate.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Certificate.cs index 9cf0929b3a2..c417ad3e1b6 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Certificate.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/Certificate.cs @@ -131,7 +131,7 @@ internal void SetCertificate(X509Certificate2 certificate) Byte[] byteArray = _certificate.GetRawCertData(); // FileMode.Create will ensure that the stream will shrink if overwritten - using (Stream s = _part.GetStream(FileMode.Create, FileAccess.Write)) + using (Stream s = _part.GetSeekableStream(FileMode.Create, FileAccess.Write)) { s.Write(byteArray, 0, byteArray.Length); } diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs index 5706e3438f6..2a7079dd432 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs @@ -157,7 +157,7 @@ internal bool Verify(X509Certificate2 signer) result = false; // content type mismatch break; } - s = part.GetStream(FileMode.Open, FileAccess.Read); + s = part.GetSeekableStream(FileMode.Open, FileAccess.Read); } using (s) @@ -609,7 +609,7 @@ private SignedXml EnsureXmlSignatureParsed() // Load the XML XmlDocument xmlDocument = new XmlDocument(); xmlDocument.PreserveWhitespace = true; - using (Stream s = SignaturePart.GetStream()) + using (Stream s = SignaturePart.GetSeekableStream()) { using (XmlTextReader xmlReader = new XmlTextReader(s)) { @@ -937,7 +937,7 @@ private void AddCustomObjectTags(IEnumerable - using (Stream s = part.GetStream(FileMode.Open, FileAccess.Read)) + using (Stream s = part.GetSeekableStream(FileMode.Open, FileAccess.Read)) { reference.AppendChild(GenerateDigestValueNode(xDoc, hashAlgorithm, s, transformName)); } diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj index f5cc90b0a55..871caa101d6 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj @@ -40,6 +40,7 @@ + From 06fa29f6c97310af2e7fe9fd9e3f556360cfa1f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2019 23:21:09 +0000 Subject: [PATCH 140/227] Update dependencies from https://github.com/dotnet/winforms build 20190719.7 (#1322) - Microsoft.Private.Winforms - 4.8.0-preview8.19369.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8d727d901e..257eb3560aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - ac0426561b158522eb8564de2bedd28f28148f8d + e22814e9e414e22098cf70c6699f2c7dd6c4bba9 diff --git a/eng/Versions.props b/eng/Versions.props index d71578af5a1..4f41adff4f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19369.6 + 4.8.0-preview8.19369.7 From 3e69101cdc3ae7e560d0e2112ec0ec70b20c66c0 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Fri, 19 Jul 2019 16:23:33 -0700 Subject: [PATCH 141/227] add wpf class library template (#1298) * add wpf class library template --- .../.template.config/dotnetcli.host.json | 24 ++++++ .../.template.config/template.json | 86 +++++++++++++++++++ .../content/WpfClassLibrary-CSharp/Class1.cs | 8 ++ .../Company.ClassLibrary1.csproj | 11 +++ .../.template.config/dotnetcli.host.json | 24 ++++++ .../.template.config/template.json | 86 +++++++++++++++++++ .../WpfClassLibrary-VisualBasic/Class1.vb | 3 + .../Company.ClassLibrary1.vbproj | 12 +++ 8 files changed, 254 insertions(+) create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/dotnetcli.host.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Class1.cs create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/dotnetcli.host.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Class1.vb create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/dotnetcli.host.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/dotnetcli.host.json new file mode 100644 index 00000000000..22ab4a3929f --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "langVersion": { + "longName": "langVersion", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json new file mode 100644 index 00000000000..59493288a3e --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json @@ -0,0 +1,86 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Common", "WPF"], + "name": "WPF Class library", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project for creating a class library that targets a .NET Core WPF Application", + "groupIdentity": "Microsoft.Common.WPF.Library", + "precedence": "3000", + "identity": "Microsoft.Common.WPF.Library.CSharp.3.0", + "shortName": "wpflib", + "tags": { + "language": "C#", + "type": "project" + }, + "sourceName": "Company.ClassLibrary1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" + } + ], + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets langVersion in the created project file", + "defaultValue": "", + "replaces": "$(ProjectLanguageVersion)" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "primaryOutputs": [ + { "path": "Company.ClassLibrary1.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "Class1.cs" + } + ], + "defaultName": "WpfLibrary1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { "text": "Run 'dotnet restore'" } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Class1.cs in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Class1.cs b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Class1.cs new file mode 100644 index 00000000000..d9f25017aee --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Class1.cs @@ -0,0 +1,8 @@ +using System; + +namespace Company.ClassLibrary1 +{ + public class Class1 + { + } +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj new file mode 100644 index 00000000000..65ea6278ce5 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj @@ -0,0 +1,11 @@ + + + + netcoreapp3.0 + TargetFrameworkOverride + Company.ClassLibrary1 + $(ProjectLanguageVersion) + true + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/dotnetcli.host.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/dotnetcli.host.json new file mode 100644 index 00000000000..22ab4a3929f --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "langVersion": { + "longName": "langVersion", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json new file mode 100644 index 00000000000..db146b70b98 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json @@ -0,0 +1,86 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Common", "WPF"], + "name": "WPF Class library", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project for creating a class library that targets a .NET Core WPF Application", + "groupIdentity": "Microsoft.Common.WPF.Library", + "precedence": "3000", + "identity": "Microsoft.Common.WPF.Library.VisualBasic.3.0", + "shortName": "wpflib", + "tags": { + "language": "VB", + "type": "project" + }, + "sourceName": "Company.ClassLibrary1", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" + } + ], + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets langVersion in the created project file", + "defaultValue": "", + "replaces": "$(ProjectLanguageVersion)" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "primaryOutputs": [ + { "path": "Company.ClassLibrary1.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "Class1.vb" + } + ], + "defaultName": "WpfLibrary1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { "text": "Run 'dotnet restore'" } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens Class1.cs in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Class1.vb b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Class1.vb new file mode 100644 index 00000000000..701656126aa --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Class1.vb @@ -0,0 +1,3 @@ +Public Class Class1 + +End Class diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj new file mode 100644 index 00000000000..8f7f324e3d7 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj @@ -0,0 +1,12 @@ + + + + Company.ClassLibrary1 + netcoreapp3.0 + TargetFrameworkOverride + Company.ClassLibrary1 + $(ProjectLanguageVersion) + true + + + From a7539cd9eb0a02635207e370e4f9eaafc2d6e3ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2019 12:28:35 +0000 Subject: [PATCH 142/227] Update dependencies from https://github.com/dotnet/arcade build 20190719.2 (#1325) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19369.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19369.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19369.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19369.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19369.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 257eb3560aa..083c3d3ac64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup fbe24089c59a9f330dfb7c4db4ae97a293685510 - + https://github.com/dotnet/arcade - eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d + a190d4865fe3c86a168ec49c4fc61c90c96ae051 - + https://github.com/dotnet/arcade - eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d + a190d4865fe3c86a168ec49c4fc61c90c96ae051 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 556b874e22a9580b511976056cf9aa664a6ad8c1 - + https://github.com/dotnet/arcade - eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d + a190d4865fe3c86a168ec49c4fc61c90c96ae051 - + https://github.com/dotnet/arcade - eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d + a190d4865fe3c86a168ec49c4fc61c90c96ae051 - + https://github.com/dotnet/arcade - eecde8a8751dbe7fdb17ba4dfbd032e26f4cae7d + a190d4865fe3c86a168ec49c4fc61c90c96ae051 diff --git a/eng/Versions.props b/eng/Versions.props index 4f41adff4f0..8d96328d469 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19368.7 - 1.0.0-beta.19368.7 - 1.0.0-beta.19368.7 + 1.0.0-beta.19369.2 + 1.0.0-beta.19369.2 + 1.0.0-beta.19369.2 diff --git a/global.json b/global.json index c1bfa2c9677..acaba9b1124 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19368.7", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19368.7" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19369.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19369.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 11922b8d9aeab7d99c06eef4cb729e864a04f2e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2019 13:13:08 +0000 Subject: [PATCH 143/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190719.3 (#1326) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19369.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 083c3d3ac64..d03c547730e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 75198f7b20e3d6470c86f3dfbcc822d2b8bdc966 + 18c660e5b332f68cbe64779797340d9ec60ed17c https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 8d96328d469..6656a9a754b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19366.1 + 4.8.0-preview8.19369.3 From c16a1af8c42ff50113207eae0a23450f508f9672 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Mon, 22 Jul 2019 13:50:17 -0700 Subject: [PATCH 144/227] Add control library templates (#1005) * adding custom control * Add user control library * align names * open both code and xaml files * rename folder from WpfControlLibrary-* to WpfUserControlLibrary-* * fix typo in template * remove extra line * remove namespace * use wpfusercontrollib as the short name * adding code files * adding default namespaces * remove unnecessary namespaces * remove un-needed InitializeComponent * rename files to include xaml * add InitializeComponent * delete duplicate file * prefix class with namespace * do not fully qualify VB xaml class name * correctly name vb file * do not condition use of root namespace --- .../Company.ClassLibrary1.vbproj | 2 +- .../.template.config/dotnetcli.host.json | 24 +++++ .../.template.config/template.json | 86 ++++++++++++++++++ .../AssemblyInfo.cs | 10 +++ .../Company.WpfCustomControlLibrary.csproj | 11 +++ .../CustomControl1.cs | 54 +++++++++++ .../Themes/Generic.xaml | 17 ++++ .../.template.config/dotnetcli.host.json | 24 +++++ .../.template.config/template.json | 86 ++++++++++++++++++ .../AssemblyInfo.vb | 11 +++ .../Company.WpfCustomControlLibrary.vbproj | 23 +++++ .../CustomControl1.vb | 18 ++++ .../Themes/Generic.xaml | 17 ++++ .../.template.config/dotnetcli.host.json | 24 +++++ .../.template.config/template.json | 90 +++++++++++++++++++ .../AssemblyInfo.cs | 10 +++ .../Company.WpfControlLibrary.csproj | 11 +++ .../UserControl1.xaml | 12 +++ .../UserControl1.xaml.cs | 28 ++++++ .../.template.config/dotnetcli.host.json | 24 +++++ .../.template.config/template.json | 90 +++++++++++++++++++ .../AssemblyInfo.vb | 11 +++ .../Company.WpfControlLibrary.vbproj | 23 +++++ .../UserControl1.xaml | 12 +++ .../UserControl1.xaml.vb | 2 + 25 files changed, 719 insertions(+), 1 deletion(-) create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/dotnetcli.host.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/AssemblyInfo.cs create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/CustomControl1.cs create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Themes/Generic.xaml create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/dotnetcli.host.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/AssemblyInfo.vb create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/CustomControl1.vb create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Themes/Generic.xaml create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/dotnetcli.host.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/AssemblyInfo.cs create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/UserControl1.xaml create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/UserControl1.xaml.cs create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/dotnetcli.host.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/AssemblyInfo.vb create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/UserControl1.xaml create mode 100644 packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/UserControl1.xaml.vb diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj index 8f7f324e3d7..5222ae5dcde 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj @@ -4,7 +4,7 @@ Company.ClassLibrary1 netcoreapp3.0 TargetFrameworkOverride - Company.ClassLibrary1 + Company.ClassLibrary1 $(ProjectLanguageVersion) true diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/dotnetcli.host.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/dotnetcli.host.json new file mode 100644 index 00000000000..22ab4a3929f --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "langVersion": { + "longName": "langVersion", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json new file mode 100644 index 00000000000..e0fbadfac7a --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json @@ -0,0 +1,86 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Common", "WPF"], + "name": "WPF Custom Control Library", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project for creating a custom control library for .NET Core WPF Applications", + "groupIdentity": "Microsoft.Common.WPF.CustomControl", + "precedence": "3000", + "identity": "Microsoft.Common.WPF.CustomControl.CSharp.3.0", + "shortName": "wpfcustomcontrollib", + "tags": { + "language": "C#", + "type": "project" + }, + "sourceName": "Company.WpfCustomControlLibrary", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" + } + ], + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets langVersion in the created project file", + "defaultValue": "", + "replaces": "$(ProjectLanguageVersion)" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "primaryOutputs": [ + { "path": "Company.WpfCustomControlLibrary.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "CustomControl1.cs" + } + ], + "defaultName": "WpfCustomControlLibrary1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { "text": "Run 'dotnet restore'" } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens CustomControl1.cs in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/AssemblyInfo.cs b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/AssemblyInfo.cs new file mode 100644 index 00000000000..3c50569420d --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly:ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj new file mode 100644 index 00000000000..e01c8a1a755 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj @@ -0,0 +1,11 @@ + + + + netcoreapp3.0 + TargetFrameworkOverride + Company.WpfCustomControlLibrary + $(ProjectLanguageVersion) + true + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/CustomControl1.cs b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/CustomControl1.cs new file mode 100644 index 00000000000..68361700126 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/CustomControl1.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Company.WpfCustomControlLibrary +{ + /// + /// Follow steps 1a or 1b and then 2 to use this custom control in a XAML file. + /// + /// Step 1a) Using this custom control in a XAML file that exists in the current project. + /// Add this XmlNamespace attribute to the root element of the markup file where it is + /// to be used: + /// + /// xmlns:MyNamespace="clr-namespace:Company.WpfCustomControlLibrary" + /// + /// + /// Step 1b) Using this custom control in a XAML file that exists in a different project. + /// Add this XmlNamespace attribute to the root element of the markup file where it is + /// to be used: + /// + /// xmlns:MyNamespace="clr-namespace:Company.WpfCustomControlLibrary;assembly=Company.WpfCustomControlLibrary" + /// + /// You will also need to add a project reference from the project where the XAML file lives + /// to this project and Rebuild to avoid compilation errors: + /// + /// Right click on the target project in the Solution Explorer and + /// "Add Reference"->"Projects"->[Select this project] + /// + /// + /// Step 2) + /// Go ahead and use your control in the XAML file. + /// + /// + /// + /// + public class CustomControl1 : Control + { + static CustomControl1() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(CustomControl1), new FrameworkPropertyMetadata(typeof(CustomControl1))); + } + } +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Themes/Generic.xaml b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Themes/Generic.xaml new file mode 100644 index 00000000000..35c5325ad87 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Themes/Generic.xaml @@ -0,0 +1,17 @@ + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/dotnetcli.host.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/dotnetcli.host.json new file mode 100644 index 00000000000..22ab4a3929f --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "langVersion": { + "longName": "langVersion", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json new file mode 100644 index 00000000000..a9d1c4b8a0b --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json @@ -0,0 +1,86 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Common", "WPF"], + "name": "WPF Custom Control Library", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project for creating a custom control library for .NET Core WPF Applications", + "groupIdentity": "Microsoft.Common.WPF.CustomControl", + "precedence": "3000", + "identity": "Microsoft.Common.WPF.CustomControl.VisualBasic.3.0", + "shortName": "wpfcustomcontrollib", + "tags": { + "language": "VB", + "type": "project" + }, + "sourceName": "Company.WpfCustomControlLibrary", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" + } + ], + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets langVersion in the created project file", + "defaultValue": "", + "replaces": "$(ProjectLanguageVersion)" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "primaryOutputs": [ + { "path": "Company.WpfCustomControlLibrary.vbproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "CustomControl1.vb" + } + ], + "defaultName": "WpfCustomControlLibrary1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { "text": "Run 'dotnet restore'" } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens CustomControl1.vb in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "args": { + "files": "1" + }, + "continueOnError": true + } + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/AssemblyInfo.vb b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/AssemblyInfo.vb new file mode 100644 index 00000000000..91a0a58fb04 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/AssemblyInfo.vb @@ -0,0 +1,11 @@ +Imports System.Windows + +'The ThemeInfo attribute describes where any theme specific and generic resource dictionaries can be found. +'1st parameter: where theme specific resource dictionaries are located +'(used if a resource is not found in the page, +' or application resource dictionaries) + +'2nd parameter: where the generic resource dictionary is located +'(used if a resource is not found in the page, +'app, and any theme specific resource dictionaries) + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj new file mode 100644 index 00000000000..c8e6eb5a00b --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj @@ -0,0 +1,23 @@ + + + + netcoreapp3.0 + TargetFrameworkOverride + Company.WpfCustomControlLibrary + $(ProjectLanguageVersion) + true + + + + + + + + + + + + + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/CustomControl1.vb b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/CustomControl1.vb new file mode 100644 index 00000000000..54b7e34239e --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/CustomControl1.vb @@ -0,0 +1,18 @@ +Public Class CustomControl1 + Inherits Control + + ''' To use this custom control in a XAML file in another project, complete the following steps: + ''' + ''' 1. Add a reference to this project + ''' 2. Add the following line to the root element of the XAML file where you wish to use this control: + ''' xmlns:MyNamespace="clr-namespace:Company.WpfCustomControlLibrary;assembly=Company.WpfCustomControlLibrary" + ''' 2. Use the control in the XAML file: + ''' + + Shared Sub New() + 'This OverrideMetadata call tells the system that this element wants to provide a style that is different than its base class. + 'This style is defined in Themes\Generic.xaml + DefaultStyleKeyProperty.OverrideMetadata(GetType(CustomControl1), New FrameworkPropertyMetadata(GetType(CustomControl1))) + End Sub + +End Class diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Themes/Generic.xaml b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Themes/Generic.xaml new file mode 100644 index 00000000000..35c5325ad87 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Themes/Generic.xaml @@ -0,0 +1,17 @@ + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/dotnetcli.host.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/dotnetcli.host.json new file mode 100644 index 00000000000..22ab4a3929f --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "langVersion": { + "longName": "langVersion", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json new file mode 100644 index 00000000000..bba6d5bafd4 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json @@ -0,0 +1,90 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Common", "WPF"], + "name": "WPF User Control Library", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project for creating a user control library for .NET Core WPF Applications", + "groupIdentity": "Microsoft.Common.WPF.Control", + "precedence": "3000", + "identity": "Microsoft.Common.WPF.Control.CSharp.3.0", + "shortName": "wpfusercontrollib", + "tags": { + "language": "C#", + "type": "project" + }, + "sourceName": "Company.WpfControlLibrary", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" + } + ], + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets langVersion in the created project file", + "defaultValue": "", + "replaces": "$(ProjectLanguageVersion)" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "primaryOutputs": [ + { "path": "Company.WpfControlLibrary.csproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "UserControl1.xaml.cs" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "UserControl1.xaml" + } + ], + "defaultName": "WpfControlLibrary1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { "text": "Run 'dotnet restore'" } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens UserControl1.xaml in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "args": { + "files": "1;2" + }, + "continueOnError": true + } + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/AssemblyInfo.cs b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/AssemblyInfo.cs new file mode 100644 index 00000000000..3c50569420d --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly:ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj new file mode 100644 index 00000000000..fc46449e179 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj @@ -0,0 +1,11 @@ + + + + netcoreapp3.0 + TargetFrameworkOverride + Company.WpfControlLibrary + $(ProjectLanguageVersion) + true + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/UserControl1.xaml b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/UserControl1.xaml new file mode 100644 index 00000000000..0525fb85a32 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/UserControl1.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/UserControl1.xaml.cs b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/UserControl1.xaml.cs new file mode 100644 index 00000000000..ed07b7ab973 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/UserControl1.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Company.WpfControlLibrary +{ + /// + /// Interaction logic for UserControl1.xaml + /// + public partial class UserControl1 : UserControl + { + public UserControl1() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/dotnetcli.host.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/dotnetcli.host.json new file mode 100644 index 00000000000..22ab4a3929f --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "TargetFrameworkOverride": { + "isHidden": "true", + "longName": "target-framework-override", + "shortName": "" + }, + "Framework": { + "longName": "framework" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + }, + "langVersion": { + "longName": "langVersion", + "shortName": "" + } + }, + "usageExamples": [ + "" + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json new file mode 100644 index 00000000000..b1553d1f87c --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json @@ -0,0 +1,90 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": ["Common", "WPF"], + "name": "WPF User Control Library", + "generatorVersions": "[1.0.0.0-*)", + "description": "A project for creating a user control library for .NET Core WPF Applications", + "groupIdentity": "Microsoft.Common.WPF.Control", + "precedence": "3000", + "identity": "Microsoft.Common.WPF.Control.VisualBasic.3.0", + "shortName": "wpfusercontrollib", + "tags": { + "language": "VB", + "type": "project" + }, + "sourceName": "Company.WpfControlLibrary", + "preferNameDirectory": true, + "symbols": { + "TargetFrameworkOverride": { + "type": "parameter", + "description": "Overrides the target framework", + "replaces": "TargetFrameworkOverride", + "datatype": "string", + "defaultValue": "" + }, + "Framework": { + "type": "parameter", + "description": "The target framework for the project.", + "datatype": "choice", + "choices": [ + { + "choice": "netcoreapp3.0", + "description": "Target netcoreapp3.0" + } + ], + "replaces": "netcoreapp3.0", + "defaultValue": "netcoreapp3.0" + }, + "langVersion": { + "type": "parameter", + "datatype": "text", + "description": "Sets langVersion in the created project file", + "defaultValue": "", + "replaces": "$(ProjectLanguageVersion)" + }, + "HostIdentifier": { + "type": "bind", + "binding": "HostIdentifier" + }, + "skipRestore": { + "type": "parameter", + "datatype": "bool", + "description": "If specified, skips the automatic restore of the project on create.", + "defaultValue": "false" + } + }, + "primaryOutputs": [ + { "path": "Company.WpfControlLibrary.vbproj" }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "UserControl1.xaml.vb" + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "path": "UserControl1.xaml" + } + ], + "defaultName": "WpfControlLibrary1", + "postActions": [ + { + "condition": "(!skipRestore)", + "description": "Restore NuGet packages required by this project.", + "manualInstructions": [ + { "text": "Run 'dotnet restore'" } + ], + "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025", + "continueOnError": true + }, + { + "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", + "description": "Opens UserControl1.xaml in the editor", + "manualInstructions": [ ], + "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6", + "args": { + "files": "1;2" + }, + "continueOnError": true + } + ] +} diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/AssemblyInfo.vb b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/AssemblyInfo.vb new file mode 100644 index 00000000000..91a0a58fb04 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/AssemblyInfo.vb @@ -0,0 +1,11 @@ +Imports System.Windows + +'The ThemeInfo attribute describes where any theme specific and generic resource dictionaries can be found. +'1st parameter: where theme specific resource dictionaries are located +'(used if a resource is not found in the page, +' or application resource dictionaries) + +'2nd parameter: where the generic resource dictionary is located +'(used if a resource is not found in the page, +'app, and any theme specific resource dictionaries) + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj new file mode 100644 index 00000000000..e90867c207e --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj @@ -0,0 +1,23 @@ + + + + netcoreapp3.0 + TargetFrameworkOverride + Company.WpfControlLibrary + $(ProjectLanguageVersion) + true + + + + + + + + + + + + + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/UserControl1.xaml b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/UserControl1.xaml new file mode 100644 index 00000000000..1fa88dea680 --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/UserControl1.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/UserControl1.xaml.vb b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/UserControl1.xaml.vb new file mode 100644 index 00000000000..29eef617e8d --- /dev/null +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/UserControl1.xaml.vb @@ -0,0 +1,2 @@ +Public Class UserControl1 +End Class \ No newline at end of file From c19bef9e298209f8e71ff8b02ea9a6fc917fbed3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2019 21:10:07 +0000 Subject: [PATCH 145/227] Update dependencies from https://github.com/dotnet/winforms build 20190722.8 (#1330) - Microsoft.Private.Winforms - 4.8.0-preview8.19372.8 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19371.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19369.4 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19369.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19369.4 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19369.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-03 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d03c547730e..a0803f6bd12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - e22814e9e414e22098cf70c6699f2c7dd6c4bba9 + 384bae4bd9838afd2e382422dec0e9accdffcc3b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/core-setup - fbe24089c59a9f330dfb7c4db4ae97a293685510 + 758a89c36c33310b2573bfa11ee2cc78e020c6c8 https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade a190d4865fe3c86a168ec49c4fc61c90c96ae051 - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 18c660e5b332f68cbe64779797340d9ec60ed17c - + https://github.com/dotnet/corefx - d1e66a529460dc0c5fb0fe0dbe1454e7c5ccea4e + 30bc337d864198b27295814d9063c825240ee17b - + https://github.com/dotnet/coreclr - 556b874e22a9580b511976056cf9aa664a6ad8c1 + cb650e00e7e3978e2ee2398aee795a6724e714f0 - + https://github.com/dotnet/coreclr - 556b874e22a9580b511976056cf9aa664a6ad8c1 + cb650e00e7e3978e2ee2398aee795a6724e714f0 - + https://github.com/dotnet/coreclr - 556b874e22a9580b511976056cf9aa664a6ad8c1 + cb650e00e7e3978e2ee2398aee795a6724e714f0 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 6656a9a754b..de5bb01af6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19367.3 + 4.6.0-preview8.19371.1 - 4.8.0-preview8.19369.7 + 4.8.0-preview8.19372.8 - 3.0.0-preview8.19366.3 - 3.0.0-preview8.19366.3 - 3.0.0-preview8.19366.3 + 3.0.0-preview8.19369.4 + 3.0.0-preview8.19369.4 + 3.0.0-preview8.19369.4 - 3.0.0-preview8-27917-07 - 3.0.0-preview8.19367.3 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 + 3.0.0-preview8-19372-03 + 3.0.0-preview8.19371.1 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 4.6.0-preview4.19176.11 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 - 4.6.0-preview8.19367.3 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 + 4.6.0-preview8.19371.1 From 2d254b1dc60dcd478deffb045298a5cb0feefc02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2019 21:26:11 +0000 Subject: [PATCH 146/227] Update dependencies from https://github.com/dotnet/winforms build 20190722.10 (#1331) - Microsoft.Private.Winforms - 4.8.0-preview8.19372.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0803f6bd12..f4d2a1bd4ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 384bae4bd9838afd2e382422dec0e9accdffcc3b + b274990d8d1f859886b7b1499c784dd13e78a6f6 diff --git a/eng/Versions.props b/eng/Versions.props index de5bb01af6e..2b8066c0723 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19372.8 + 4.8.0-preview8.19372.10 From 4f0fbbbafe00b9575baee267afbf720560d628d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2019 21:51:01 +0000 Subject: [PATCH 147/227] Update dependencies from https://github.com/dotnet/winforms build 20190722.9 (#1332) - Microsoft.Private.Winforms - 4.8.0-preview8.19372.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4d2a1bd4ac..50cb2f3857a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - b274990d8d1f859886b7b1499c784dd13e78a6f6 + 454f958f20098d82f45192dce8ac9e6a18702758 diff --git a/eng/Versions.props b/eng/Versions.props index 2b8066c0723..a77bc35d57b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19372.10 + 4.8.0-preview8.19372.9 From 654b6a2ec8cc54573bcdf7650cd19d1eee32d7b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 01:11:04 +0000 Subject: [PATCH 148/227] Update dependencies from https://github.com/dotnet/winforms build 20190722.11 (#1337) - Microsoft.Private.Winforms - 4.8.0-preview8.19372.11 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50cb2f3857a..f399f5bd431 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 454f958f20098d82f45192dce8ac9e6a18702758 + 258bc68b87a466ff25f370665e3b5075f28e2879 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/core-setup - 758a89c36c33310b2573bfa11ee2cc78e020c6c8 + da656496d3f82d94ed963bfdbe7d1ee86de350de https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade a190d4865fe3c86a168ec49c4fc61c90c96ae051 - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 18c660e5b332f68cbe64779797340d9ec60ed17c - + https://github.com/dotnet/corefx - 30bc337d864198b27295814d9063c825240ee17b + 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index a77bc35d57b..29f670bf6f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19371.1 + 4.6.0-preview8.19372.4 - 4.8.0-preview8.19372.9 + 4.8.0-preview8.19372.11 @@ -18,25 +18,25 @@ - 3.0.0-preview8-19372-03 - 3.0.0-preview8.19371.1 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 + 3.0.0-preview8-19372-07 + 3.0.0-preview8.19372.4 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 4.6.0-preview4.19176.11 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 - 4.6.0-preview8.19371.1 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.4 From 574e374ffa097305314a669d7ab5f5b42a8bd2c1 Mon Sep 17 00:00:00 2001 From: Dilip Ojha Date: Mon, 22 Jul 2019 18:20:55 -0700 Subject: [PATCH 149/227] overriding GetHashCode for MilColorF (#1308) --- .../src/Common/Graphics/wgx_core_types.cs | 9 +++++++++ .../src/PresentationCore/System/Windows/Media/Color.cs | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/Microsoft.DotNet.Wpf/src/Common/Graphics/wgx_core_types.cs b/src/Microsoft.DotNet.Wpf/src/Common/Graphics/wgx_core_types.cs index 3ed7983f254..0e703452127 100644 --- a/src/Microsoft.DotNet.Wpf/src/Common/Graphics/wgx_core_types.cs +++ b/src/Microsoft.DotNet.Wpf/src/Common/Graphics/wgx_core_types.cs @@ -454,6 +454,15 @@ internal struct MilColorF internal float g; internal float b; internal float a; + + public override int GetHashCode() + { + return a.GetHashCode() ^ r.GetHashCode() ^ g.GetHashCode() ^ b.GetHashCode(); + } + public override bool Equals(object obj) + { + return base.Equals(obj); + } }; /// diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs index 2e56de0ce4c..0e9709fd532 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs @@ -1158,6 +1158,15 @@ private void ComputeNativeValues(int numChannels) private struct MILColorF // this structure is the "milrendertypes.h" structure and should be identical for performance { public float a, r, g, b; + + public override int GetHashCode() + { + return a.GetHashCode() ^ r.GetHashCode() ^ g.GetHashCode() ^ b.GetHashCode(); + } + public override bool Equals(object obj) + { + return base.Equals(obj); + } }; private MILColorF scRgbColor; From a9b5c09e1a9fed653b23408afdeb1d80f59a55f7 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 22 Jul 2019 18:28:16 -0700 Subject: [PATCH 150/227] Remove support for `UseLegacyDangerousClipboardDeserializationMode` (#1286) * Remove support for `UseLegacyDangerousClipboardDeserializationMode` and permanently disallow deserialization of dangerous types. --- .../MS/internal/CoreAppContextSwitches.cs | 19 ---------- .../System/AppContextDefaultValues.cs | 1 - .../System/Windows/clipboard.cs | 11 ------ .../System/Windows/dataobject.cs | 36 +++++++++++++------ .../MS/Internal/Ink/XamlClipboardData.cs | 3 +- .../Windows/Documents/TextEditorCopyPaste.cs | 3 +- .../System/Windows/Documents/WpfPayload.cs | 3 +- 7 files changed, 29 insertions(+), 47 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CoreAppContextSwitches.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CoreAppContextSwitches.cs index 69fa8116692..2202f636325 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CoreAppContextSwitches.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CoreAppContextSwitches.cs @@ -337,25 +337,6 @@ public static bool AllowExternalProcessToBlockAccessToTemporaryFiles #endregion - #region EnableLegacyDangerousClipboardDeserializationMode - - internal const string EnableLegacyDangerousClipboardDeserializationModeSwitchName = "Switch.System.Windows.EnableLegacyDangerousClipboardDeserializationMode"; - private static int _enableLegacyDangerousClipboardDeserializationMode; - public static bool EnableLegacyDangerousClipboardDeserializationMode - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - get - { - /// - /// Malicious managed objects could be placed in the clipboard lying about its format, - /// to fix this OleConverter now restricts object deserialization in some cases. - /// When this switch is enabled behavior falls back to deserializing without restriction. - /// - return LocalAppContext.GetCachedSwitchValue(EnableLegacyDangerousClipboardDeserializationModeSwitchName, ref _enableLegacyDangerousClipboardDeserializationMode); - } - } - - #endregion } #pragma warning restore 436 } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/AppContextDefaultValues.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/AppContextDefaultValues.cs index 831ae48a00a..658044e25b8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/AppContextDefaultValues.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/AppContextDefaultValues.cs @@ -60,7 +60,6 @@ private static void InitializeNetFxSwitchDefaultsForNetCoreRuntime() LocalAppContext.DefineSwitchDefault(CoreAppContextSwitches.ShouldNotRenderInNonInteractiveWindowStationSwitchName, false); LocalAppContext.DefineSwitchDefault(CoreAppContextSwitches.DoNotUsePresentationDpiCapabilityTier3OrGreaterSwitchName, false); LocalAppContext.DefineSwitchDefault(CoreAppContextSwitches.AllowExternalProcessToBlockAccessToTemporaryFilesSwitchName, false); - LocalAppContext.DefineSwitchDefault(CoreAppContextSwitches.EnableLegacyDangerousClipboardDeserializationModeSwitchName, false); } } #pragma warning restore 436 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/clipboard.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/clipboard.cs index bd0b14d1ba9..9f30b4b16b9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/clipboard.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/clipboard.cs @@ -490,17 +490,6 @@ public static void SetDataObject(object data, bool copy) // //------------------------------------------------------ - /// - /// Determines whether the legacy dangerous clipboard deserialization mode should be used based on the AppContext switch and Device Guard policies. - /// - /// - /// If Device Guard is enabled this method returns false, otherwise it returns the AppContext switch value. - /// - internal static bool UseLegacyDangerousClipboardDeserializationMode() - { - return !IsDeviceGuardEnabled && CoreAppContextSwitches.EnableLegacyDangerousClipboardDeserializationMode; - } - /// /// Places data on the system Clipboard and uses copy to specify whether the data /// should remain on the Clipboard after the application exits. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs index 0a8d2c3e0a6..4874a0211e0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs @@ -2863,13 +2863,33 @@ private object GetDataFromHGLOBAL(string format, IntPtr hglobal) { data = ReadBitmapSourceFromHandle(hglobal); } - // Restrict deserialization to only primitives - // and strings here to prevent potentially malicious objects from + // Limit deserialization to DataFormats that correspond to primitives, which are: + // + // DataFormats.CommaSeparatedValue + // DataFormats.FileDrop + // DataFormats.Html + // DataFormats.OemText + // DataFormats.PenData + // DataFormats.Rtf + // DataFormats.Serializable + // DataFormats.Text + // DataFormats.UnicodeText + // DataFormats.WaveAudio + // DataFormats.Xaml + // DataFormats.XamlPackage + // DataFormats.StringFormat * + // + // * Out of these, we will disallow deserialization of + // DataFormats.StringFormat to prevent potentially malicious objects from // being deserialized as part of a "text" copy-paste or drag-drop. + // TypeRestrictingSerializationBinder will throw when it encounters + // anything other than strings and primitives - this ensures that we will + // continue successfully deserializing basic strings while rejecting other + // data types that advertise themselves as DataFormats.StringFormat. + // // The rest of the following formats are pre-defined in the OS, - // they are not managed objects so we shouldn't try to deserialize them as such, - // allow primitives in a best effort for compat, but restrict other types. - else if (!Clipboard.UseLegacyDangerousClipboardDeserializationMode()) + // they are not managed objects - an so we will not attempt to deserialize them. + else { bool restrictDeserialization = (IsFormatEqual(format, DataFormats.StringFormat) || @@ -2888,11 +2908,7 @@ private object GetDataFromHGLOBAL(string format, IntPtr hglobal) data = ReadObjectFromHandle(hglobal, restrictDeserialization); } - else - { - data = ReadObjectFromHandle(hglobal, restrictDeserialization: false); - } -} + } return data; } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/XamlClipboardData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/XamlClipboardData.cs index 780889e83b7..2ca03e10a10 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/XamlClipboardData.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/XamlClipboardData.cs @@ -100,8 +100,7 @@ protected override void DoPaste(IDataObject dataObject) if ( !String.IsNullOrEmpty(xml) ) { - bool useRestrictiveXamlReader = !Clipboard.UseLegacyDangerousClipboardDeserializationMode(); - UIElement element = XamlReader.Load(new System.Xml.XmlTextReader(new System.IO.StringReader(xml)), useRestrictiveXamlReader) as UIElement; + UIElement element = XamlReader.Load(new System.Xml.XmlTextReader(new System.IO.StringReader(xml)), useRestrictiveXamlReader: true) as UIElement; if (element != null) { ElementList.Add(element); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextEditorCopyPaste.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextEditorCopyPaste.cs index c619adef732..bd3cf4c9af7 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextEditorCopyPaste.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextEditorCopyPaste.cs @@ -923,8 +923,7 @@ private static bool PasteXaml(TextEditor This, string pasteXaml) try { // Parse the fragment into a separate subtree - bool useRestrictiveXamlReader = !Clipboard.UseLegacyDangerousClipboardDeserializationMode(); - object xamlObject = XamlReader.Load(new XmlTextReader(new System.IO.StringReader(pasteXaml)), useRestrictiveXamlReader); + object xamlObject = XamlReader.Load(new XmlTextReader(new System.IO.StringReader(pasteXaml)), useRestrictiveXamlReader: true); TextElement flowContent = xamlObject as TextElement; success = flowContent == null ? false : PasteTextElement(This, flowContent); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/WpfPayload.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/WpfPayload.cs index 7627c4c9fc8..79e924c6788 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/WpfPayload.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/WpfPayload.cs @@ -344,8 +344,7 @@ internal static object LoadElement(Stream stream) parserContext.BaseUri = entryPartUri; // Call xaml parser - bool useRestrictiveXamlReader = !Clipboard.UseLegacyDangerousClipboardDeserializationMode(); - xamlObject = XamlReader.Load(xamlEntryPart.GetSeekableStream(), parserContext, useRestrictiveXamlReader); + xamlObject = XamlReader.Load(xamlEntryPart.GetSeekableStream(), parserContext, useRestrictiveXamlReader: true); // Remove the temporary uri from the PackageStore PackageStore.RemovePackage(packageUri); From 4d120ac519de6c06e473cf6d729ddb445d55a42e Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 22 Jul 2019 18:39:43 -0700 Subject: [PATCH 151/227] Suppress warnings generated by native-tools installation. (#1339) Suppress warnings generated by native-tools installation --- eng/configure-toolset.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 index eae6468189c..bb0244b3841 100644 --- a/eng/configure-toolset.ps1 +++ b/eng/configure-toolset.ps1 @@ -26,4 +26,4 @@ if ($ci) { # Always generate binary logs $binaryLog = $true $DoNotAbortNativeToolsInstallationOnFailure = $true - +$DoNotDisplayNativeToolsInstallationWarnings =$true From 94df88202a97d2789a39fb82106bbc4498c9e7ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 05:31:07 +0000 Subject: [PATCH 152/227] Update dependencies from https://github.com/dotnet/winforms build 20190722.15 (#1342) - Microsoft.Private.Winforms - 4.8.0-preview8.19372.15 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19372.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19372.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19372.2 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19372.2 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19372-10 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f399f5bd431..0bb1de8fe47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 258bc68b87a466ff25f370665e3b5075f28e2879 + 59b6719ab1c763c839994e70d58a555dc3554900 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/core-setup - da656496d3f82d94ed963bfdbe7d1ee86de350de + 563d3d86e5d65f4493d5928b21539b34b71c524a https://github.com/dotnet/arcade @@ -83,17 +83,17 @@ https://github.com/dotnet/corefx 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/coreclr - cb650e00e7e3978e2ee2398aee795a6724e714f0 + 7e8941976e98230ccaf890c8966a5b506fb280bd - + https://github.com/dotnet/coreclr - cb650e00e7e3978e2ee2398aee795a6724e714f0 + 7e8941976e98230ccaf890c8966a5b506fb280bd - + https://github.com/dotnet/coreclr - cb650e00e7e3978e2ee2398aee795a6724e714f0 + 7e8941976e98230ccaf890c8966a5b506fb280bd https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 29f670bf6f4..21ae2b46399 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ - 4.8.0-preview8.19372.11 + 4.8.0-preview8.19372.15 - 3.0.0-preview8.19369.4 - 3.0.0-preview8.19369.4 - 3.0.0-preview8.19369.4 + 3.0.0-preview8.19372.2 + 3.0.0-preview8.19372.2 + 3.0.0-preview8.19372.2 - 3.0.0-preview8-19372-07 + 3.0.0-preview8-19372-10 3.0.0-preview8.19372.4 4.6.0-preview8.19372.4 4.6.0-preview8.19372.4 From 72cdda2b1828bd38cc5115ce067c723b175381ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 06:46:04 +0000 Subject: [PATCH 153/227] Update dependencies from https://github.com/dotnet/winforms build 20190722.16 (#1343) - Microsoft.Private.Winforms - 4.8.0-preview8.19372.16 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-19372-13 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bb1de8fe47..4d8faaae90c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 59b6719ab1c763c839994e70d58a555dc3554900 + 1501de3bb5650a8a034003193f8e56fe8b00528e @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://github.com/dotnet/core-setup - 563d3d86e5d65f4493d5928b21539b34b71c524a + d8d2b9dbfbca139724ad3b076783bdef42ae5a38 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 21ae2b46399..b62e48426d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19372.15 + 4.8.0-preview8.19372.16 @@ -18,7 +18,7 @@ - 3.0.0-preview8-19372-10 + 3.0.0-preview8-19372-13 3.0.0-preview8.19372.4 4.6.0-preview8.19372.4 4.6.0-preview8.19372.4 From c77cfddd435bb90dd109955aa3a5c991153debd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 12:23:11 +0000 Subject: [PATCH 154/227] Update dependencies from https://github.com/dotnet/arcade build 20190722.10 (#1348) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19372.10 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19372.10 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19372.10 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19372.10 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19372.10 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/init-tools-native.ps1 | 8 +++++++- global.json | 4 ++-- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d8faaae90c..4995e014ec6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup d8d2b9dbfbca139724ad3b076783bdef42ae5a38 - + https://github.com/dotnet/arcade - a190d4865fe3c86a168ec49c4fc61c90c96ae051 + 0793e2df782efc9ccae387bc779b2549208fa4a1 - + https://github.com/dotnet/arcade - a190d4865fe3c86a168ec49c4fc61c90c96ae051 + 0793e2df782efc9ccae387bc779b2549208fa4a1 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr 7e8941976e98230ccaf890c8966a5b506fb280bd - + https://github.com/dotnet/arcade - a190d4865fe3c86a168ec49c4fc61c90c96ae051 + 0793e2df782efc9ccae387bc779b2549208fa4a1 - + https://github.com/dotnet/arcade - a190d4865fe3c86a168ec49c4fc61c90c96ae051 + 0793e2df782efc9ccae387bc779b2549208fa4a1 - + https://github.com/dotnet/arcade - a190d4865fe3c86a168ec49c4fc61c90c96ae051 + 0793e2df782efc9ccae387bc779b2549208fa4a1 diff --git a/eng/Versions.props b/eng/Versions.props index b62e48426d0..4a609c379e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19369.2 - 1.0.0-beta.19369.2 - 1.0.0-beta.19369.2 + 1.0.0-beta.19372.10 + 1.0.0-beta.19372.10 + 1.0.0-beta.19372.10 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 9d18645f455..eaa05880c55 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -103,7 +103,13 @@ try { if ($LASTEXITCODE -Ne "0") { $errMsg = "$ToolName installation failed" if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - Write-Warning $errMsg + $showNativeToolsWarning = $true + if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { + $showNativeToolsWarning = $false + } + if ($showNativeToolsWarning) { + Write-Warning $errMsg + } $toolInstallationFailure = $true } else { Write-Error $errMsg diff --git a/global.json b/global.json index acaba9b1124..4be39cb1160 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19369.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19369.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19372.10", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19372.10" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From dcb54c3d8e058a190a8be1c889c699ce51936af1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 13:22:15 +0000 Subject: [PATCH 155/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190722.8 (#1349) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19372.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4995e014ec6..3926bba1783 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 18c660e5b332f68cbe64779797340d9ec60ed17c + c6d123f52fe7f4e5c166d5b910dd1d0dc2c5bf3d https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 4a609c379e2..efd332aa6c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19369.3 + 4.8.0-preview8.19372.8 From a28b4cad457deffcb85d33ae612a2c063ce47b4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 19:10:05 +0000 Subject: [PATCH 156/227] Update dependencies from https://github.com/dotnet/winforms build 20190723.1 (#1347) - Microsoft.Private.Winforms - 4.8.0-preview8.19373.1 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.DirectoryServices - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Drawing.Common - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Reflection.Emit - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Security.AccessControl - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Security.Permissions - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Security.Principal.Windows - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - System.IO.Packaging - 4.6.0-preview8.19372.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 3.0.0-preview8.19372.4 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm - 3.0.0-preview8.19372.4 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview8.19372.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-19373-02 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3926bba1783..669fcda2655 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 1501de3bb5650a8a034003193f8e56fe8b00528e + cc1e4274a44cc2bdf22cf13b4fe38a5c0746d4fc - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/core-setup - d8d2b9dbfbca139724ad3b076783bdef42ae5a38 + 1ff3588d49079733e228a7d34bc06ebc33796bc1 https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade 0793e2df782efc9ccae387bc779b2549208fa4a1 - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int c6d123f52fe7f4e5c166d5b910dd1d0dc2c5bf3d - + https://github.com/dotnet/corefx - 342ad3bd3e432be9c7a9df5d533832e5d86ef6e0 + d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/coreclr - 7e8941976e98230ccaf890c8966a5b506fb280bd + c01a9a157d512343ef104bb2b1f97b356e708b11 - + https://github.com/dotnet/coreclr - 7e8941976e98230ccaf890c8966a5b506fb280bd + c01a9a157d512343ef104bb2b1f97b356e708b11 - + https://github.com/dotnet/coreclr - 7e8941976e98230ccaf890c8966a5b506fb280bd + c01a9a157d512343ef104bb2b1f97b356e708b11 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index efd332aa6c1..035c6497c96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,39 +4,39 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.8 - 4.8.0-preview8.19372.16 + 4.8.0-preview8.19373.1 - 3.0.0-preview8.19372.2 - 3.0.0-preview8.19372.2 - 3.0.0-preview8.19372.2 + 3.0.0-preview8.19372.4 + 3.0.0-preview8.19372.4 + 3.0.0-preview8.19372.4 - 3.0.0-preview8-19372-13 - 3.0.0-preview8.19372.4 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 + 3.0.0-preview8-19373-02 + 3.0.0-preview8.19372.8 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 4.6.0-preview4.19176.11 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 - 4.6.0-preview8.19372.4 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 + 4.6.0-preview8.19372.8 From 48e37ed906067d0f1dd10e9e3ae92593b3ebf299 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 19:41:21 +0000 Subject: [PATCH 157/227] Update dependencies from https://github.com/dotnet/winforms build 20190723.2 (#1352) - Microsoft.Private.Winforms - 4.8.0-preview8.19373.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 669fcda2655..51e804914b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - cc1e4274a44cc2bdf22cf13b4fe38a5c0746d4fc + b033392baaec90ae768ef618df968d797ac95684 diff --git a/eng/Versions.props b/eng/Versions.props index 035c6497c96..fe642245341 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19373.1 + 4.8.0-preview8.19373.2 From 8bb39fc43670515e3ed86e7775ee2f1bc02163b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 21:45:07 +0000 Subject: [PATCH 158/227] Update dependencies from https://github.com/dotnet/winforms build 20190723.4 (#1353) - Microsoft.Private.Winforms - 4.8.0-preview8.19373.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51e804914b3..6bd1bdcf7f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - b033392baaec90ae768ef618df968d797ac95684 + e58c39568dfac04aa87d122783967471cbb35396 diff --git a/eng/Versions.props b/eng/Versions.props index fe642245341..5dd900827b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19373.2 + 4.8.0-preview8.19373.4 From a2c152d4de8109e27c5bc44eade2e90ffb2398b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 22:11:17 +0000 Subject: [PATCH 159/227] Update dependencies from https://github.com/dotnet/winforms build 20190723.3 (#1354) - Microsoft.Private.Winforms - 4.8.0-preview8.19373.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bd1bdcf7f9..58853aac5a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - e58c39568dfac04aa87d122783967471cbb35396 + a3d3a168e32156190e94bd8af3db033b0b35968b diff --git a/eng/Versions.props b/eng/Versions.props index 5dd900827b2..10cd1a375c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19373.4 + 4.8.0-preview8.19373.3 From 6e057813ebe6d170a507133708015b6ffe56fa7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 22:16:57 +0000 Subject: [PATCH 160/227] Update dependencies from https://github.com/dotnet/arcade build 20190723.4 (#1355) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19373.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19373.4 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19373.4 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19373.4 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19373.4 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58853aac5a7..f43a2095707 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 1ff3588d49079733e228a7d34bc06ebc33796bc1 - + https://github.com/dotnet/arcade - 0793e2df782efc9ccae387bc779b2549208fa4a1 + 6552a851638e292f187bb98fb88ae8b463336cd3 - + https://github.com/dotnet/arcade - 0793e2df782efc9ccae387bc779b2549208fa4a1 + 6552a851638e292f187bb98fb88ae8b463336cd3 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr c01a9a157d512343ef104bb2b1f97b356e708b11 - + https://github.com/dotnet/arcade - 0793e2df782efc9ccae387bc779b2549208fa4a1 + 6552a851638e292f187bb98fb88ae8b463336cd3 - + https://github.com/dotnet/arcade - 0793e2df782efc9ccae387bc779b2549208fa4a1 + 6552a851638e292f187bb98fb88ae8b463336cd3 - + https://github.com/dotnet/arcade - 0793e2df782efc9ccae387bc779b2549208fa4a1 + 6552a851638e292f187bb98fb88ae8b463336cd3 diff --git a/eng/Versions.props b/eng/Versions.props index 10cd1a375c1..b0178cb08ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19372.10 - 1.0.0-beta.19372.10 - 1.0.0-beta.19372.10 + 1.0.0-beta.19373.4 + 1.0.0-beta.19373.4 + 1.0.0-beta.19373.4 diff --git a/global.json b/global.json index 4be39cb1160..d55984255ab 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19372.10", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19372.10" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19373.4", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19373.4" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 2575fb0015793a4ab09fa160247bf5c4981bce4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 22:29:39 +0000 Subject: [PATCH 161/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190723.7 (#1356) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19373.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f43a2095707..2c9c0316048 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx d594cb2dbc5027d7e996491b0722c5be5204460f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - c6d123f52fe7f4e5c166d5b910dd1d0dc2c5bf3d + 8aa486183ae5b8f8312fcec110932ca095fd1478 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index b0178cb08ec..2297fe71131 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19372.8 + 4.8.0-preview8.19373.7 From 8b20a88a69d268168569deb6284193f8e5c56c6a Mon Sep 17 00:00:00 2001 From: Arpit Dev Mathur Date: Tue, 23 Jul 2019 15:38:46 -0700 Subject: [PATCH 162/227] Fixing MAS Compliance Issues (#1278) * Ensuring GroupItemAutomationPeer adds underlying ExpanderPeer to its list of children peers * Enabling ScrollPattern only when Combobox dropDown is opened * Addressing PR feedback --- .../Peers/ComboBoxAutomationPeer.cs | 6 ++++- .../Peers/GroupItemAutomationPeer.cs | 27 +++++++++++++------ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/ComboBoxAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/ComboBoxAutomationPeer.cs index 8476bfb2e6f..7b426dca759 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/ComboBoxAutomationPeer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/ComboBoxAutomationPeer.cs @@ -51,16 +51,20 @@ override protected string GetClassNameCore() override public object GetPattern(PatternInterface pattern) { object iface = null; + ComboBox owner = (ComboBox)Owner; if (pattern == PatternInterface.Value) { - ComboBox owner = (ComboBox)Owner; if (owner.IsEditable) iface = this; } else if(pattern == PatternInterface.ExpandCollapse) { iface = this; } + else if (pattern == PatternInterface.Scroll && !owner.IsDropDownOpen) + { + iface = this; + } else { iface = base.GetPattern(pattern); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/GroupItemAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/GroupItemAutomationPeer.cs index 6d551508d15..e205f79c15f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/GroupItemAutomationPeer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/GroupItemAutomationPeer.cs @@ -130,14 +130,7 @@ protected override List GetChildrenCore() ItemsControlAutomationPeer itemsControlAP = itemsControl.CreateAutomationPeer() as ItemsControlAutomationPeer; if (itemsControlAP != null) { - Panel itemsHost = owner.ItemsHost; - - if (itemsHost == null) - return null; - - IList childItems = itemsHost.Children; - List children = new List(childItems.Count); - ItemPeersStorage addedChildren = new ItemPeersStorage(); + List children = new List(); bool useNetFx472CompatibleAccessibilityFeatures = AccessibilitySwitches.UseNetFx472CompatibleAccessibilityFeatures; if (!useNetFx472CompatibleAccessibilityFeatures && owner.Expander != null) @@ -152,6 +145,24 @@ protected override List GetChildrenCore() _expanderPeer.GetChildren(); } } + Panel itemsHost = owner.ItemsHost; + + if (itemsHost == null) + { + if (_expanderPeer == null) + { + return null; + } + else + { + children.Add(_expanderPeer); + return children; + } + } + + IList childItems = itemsHost.Children; + ItemPeersStorage addedChildren = new ItemPeersStorage(); + foreach (UIElement child in childItems) { From c2205e25b2f4589763239090449cc16da3616e0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 01:11:04 +0000 Subject: [PATCH 163/227] Update dependencies from https://github.com/dotnet/winforms build 20190723.6 (#1357) - Microsoft.Private.Winforms - 4.8.0-preview8.19373.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c9c0316048..6961962ada9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - a3d3a168e32156190e94bd8af3db033b0b35968b + ecf92b365e62ad28f04796c717c30c9fce1c7939 diff --git a/eng/Versions.props b/eng/Versions.props index 2297fe71131..4d5a5271257 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19373.3 + 4.8.0-preview8.19373.6 From 2b4e89123b01f567f677ff61ddde7bbfaf07620e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 02:41:09 +0000 Subject: [PATCH 164/227] Update dependencies from https://github.com/dotnet/winforms build 20190723.7 (#1358) - Microsoft.Private.Winforms - 4.8.0-preview8.19373.7 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-12 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6961962ada9..d018be21621 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - ecf92b365e62ad28f04796c717c30c9fce1c7939 + 21dfd4b3d3bf428a7cd4c01f18c0b0abb04d9bc7 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/core-setup - 1ff3588d49079733e228a7d34bc06ebc33796bc1 + 1d0d28cf1f3aa4dddc136c9df8edc976b600135e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 4d5a5271257..366dae71339 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19373.6 + 4.8.0-preview8.19373.7 @@ -18,7 +18,7 @@ - 3.0.0-preview8-19373-02 + 3.0.0-preview8-28373-12 3.0.0-preview8.19372.8 4.6.0-preview8.19372.8 4.6.0-preview8.19372.8 From 54cf10e02a6d6c92f74f02c4a0f903e4a30bc3d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 03:16:02 +0000 Subject: [PATCH 165/227] Update dependencies from https://github.com/dotnet/winforms build 20190723.8 (#1359) - Microsoft.Private.Winforms - 4.8.0-preview8.19373.8 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-14 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d018be21621..8622e893fba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 21dfd4b3d3bf428a7cd4c01f18c0b0abb04d9bc7 + d177172f1f942e207cb40795b946311af63b37df @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/core-setup - 1d0d28cf1f3aa4dddc136c9df8edc976b600135e + 4c34f98d3f3f32623d574cb98bfb74c9831fa21b https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 366dae71339..6e79116f345 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19373.7 + 4.8.0-preview8.19373.8 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28373-12 + 3.0.0-preview8-28373-14 3.0.0-preview8.19372.8 4.6.0-preview8.19372.8 4.6.0-preview8.19372.8 From 330d3ca182ffc55f09b1f5ba1c758b08f80c2c74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 05:21:06 +0000 Subject: [PATCH 166/227] Update dependencies from https://github.com/dotnet/winforms build 20190723.9 (#1361) - Microsoft.Private.Winforms - 4.8.0-preview8.19373.9 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App - 3.0.0-preview8-28373-17 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8622e893fba..21bbb7fd44f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - d177172f1f942e207cb40795b946311af63b37df + 774bd34a750016e596808bc6106d63b79dff2462 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/core-setup - 4c34f98d3f3f32623d574cb98bfb74c9831fa21b + 5d8d5e866113c9f144136a04222f191456dfff1d https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 6e79116f345..a43f3c1265c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19373.8 + 4.8.0-preview8.19373.9 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28373-14 + 3.0.0-preview8-28373-17 3.0.0-preview8.19372.8 4.6.0-preview8.19372.8 4.6.0-preview8.19372.8 From 56505e4bb5cf2a74e77040bd03b4b5099d9a5b6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 10:06:13 +0000 Subject: [PATCH 167/227] Update dependencies from https://github.com/dotnet/winforms build 20190724.1 (#1365) - Microsoft.Private.Winforms - 4.8.0-preview8.19374.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21bbb7fd44f..5dbc4eb5451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 774bd34a750016e596808bc6106d63b79dff2462 + 070e1ea471f850316ca3ba1b5b429f4928d1c966 diff --git a/eng/Versions.props b/eng/Versions.props index a43f3c1265c..9134535cbd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19373.9 + 4.8.0-preview8.19374.1 From 8fc775f7fb9951e7b176a4a86aaec14fa9fa1061 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 12:46:07 +0000 Subject: [PATCH 168/227] Update dependencies from https://github.com/dotnet/winforms build 20190724.2 (#1368) - Microsoft.Private.Winforms - 4.8.0-preview8.19374.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dbc4eb5451..b9844db2060 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 070e1ea471f850316ca3ba1b5b429f4928d1c966 + 0b3c81de6ca2237f12b65758fcb854cc89115cbd diff --git a/eng/Versions.props b/eng/Versions.props index 9134535cbd2..f3ff2c53623 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19374.1 + 4.8.0-preview8.19374.2 From 8b484ba384d17e91aaa25852f5c74855ec8864a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 13:23:02 +0000 Subject: [PATCH 169/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190723.14 (#1369) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19373.14 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9844db2060..ee719dceb8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx d594cb2dbc5027d7e996491b0722c5be5204460f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 8aa486183ae5b8f8312fcec110932ca095fd1478 + d6cdc6daf9ddfeee3731ca75c8205589195d7adb https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index f3ff2c53623..d14b8b16751 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,6 +107,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19373.7 + 4.8.0-preview8.19373.14 From 501b4a26810e09bbd7516c616eadf0af9c694f0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 13:31:06 +0000 Subject: [PATCH 170/227] [master] Update dependencies from dotnet/winforms (#1370) * Update dependencies from https://github.com/dotnet/winforms build 20190724.3 - Microsoft.Private.Winforms - 4.8.0-preview8.19374.3 * Update dependencies from https://github.com/dotnet/winforms build 20190724.4 - Microsoft.Private.Winforms - 4.8.0-preview8.19374.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee719dceb8d..d2b64dfb2a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 0b3c81de6ca2237f12b65758fcb854cc89115cbd + 13da31556221e440a19e625c4b67c8e700b0e54d diff --git a/eng/Versions.props b/eng/Versions.props index d14b8b16751..8314b9fd79c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19374.2 + 4.8.0-preview8.19374.4 From 9a8700509fcfc2c3e6fdeb90cb9b175068e4797b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 14:06:05 +0000 Subject: [PATCH 171/227] Update dependencies from https://github.com/dotnet/winforms build 20190724.6 (#1371) - Microsoft.Private.Winforms - 4.8.0-preview8.19374.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2b64dfb2a4..32887af4f01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 13da31556221e440a19e625c4b67c8e700b0e54d + 79295a1708637c0919e6cfa7275ebf0a61578867 diff --git a/eng/Versions.props b/eng/Versions.props index 8314b9fd79c..e1f63133b0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19374.4 + 4.8.0-preview8.19374.6 From decbc6980a60b70a6d77e689b1d85011b8254387 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2019 14:37:58 +0000 Subject: [PATCH 172/227] Update dependencies from https://github.com/dotnet/winforms build 20190724.5 (#1372) - Microsoft.Private.Winforms - 4.8.0-preview8.19374.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32887af4f01..37e4d0f6627 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 79295a1708637c0919e6cfa7275ebf0a61578867 + 8e5a927f65fc55dce30257abf4e309982942f533 diff --git a/eng/Versions.props b/eng/Versions.props index e1f63133b0d..51f6e0d6c0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19374.6 + 4.8.0-preview8.19374.5 From ab865773fda68e0c52f2472fc2a34ff2e0731b30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2019 00:51:12 +0000 Subject: [PATCH 173/227] Update dependencies from https://github.com/dotnet/winforms build 20190724.7 (#1376) - Microsoft.Private.Winforms - 4.8.0-preview8.19374.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37e4d0f6627..479284114cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 8e5a927f65fc55dce30257abf4e309982942f533 + f18f93d0163a3cca64634b6c7c424833b1659be0 diff --git a/eng/Versions.props b/eng/Versions.props index 51f6e0d6c0d..557fd3eb092 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19374.5 + 4.8.0-preview8.19374.7 From 9f9c0426b33dee76319460e56f9f0459aee22206 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Wed, 24 Jul 2019 21:34:19 -0700 Subject: [PATCH 174/227] New C++ toolset with partial fixes for https://github.com/dotnet/wpf/issues/634 (#1375) --- eng/Versions.props | 5 +++ .../tools/Wpf.Cpp.PrivateTools.props | 27 ++++++++++++ .../tools/Wpf.Cpp.PrivateTools.targets | 43 +++++++++++++++++++ eng/WpfArcadeSdk/tools/Wpf.Cpp.props | 24 +---------- eng/WpfArcadeSdk/tools/Wpf.Cpp.targets | 29 +------------ global.json | 2 +- 6 files changed, 80 insertions(+), 50 deletions(-) create mode 100644 eng/WpfArcadeSdk/tools/Wpf.Cpp.PrivateTools.props create mode 100644 eng/WpfArcadeSdk/tools/Wpf.Cpp.PrivateTools.targets diff --git a/eng/Versions.props b/eng/Versions.props index 557fd3eb092..ba9ee866012 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,6 +59,11 @@ 2.4.0 $(XUnitVersion) $(XUnitVersion) + + 0.0.0.6 + + + $(RepoRoot).tools\native\bin\msvcurt-c1xx\$(MsvcurtC1xxVersion)\$(Architecture)\ + $(MsvcurtC1xxToolsPath)msvcurt$(LibSuffix)_netcore.lib + + + + + + %(AdditionalDependencies);$(MsvcurtNetCoreLib) + + + diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.PrivateTools.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.PrivateTools.targets new file mode 100644 index 00000000000..80ad4843126 --- /dev/null +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.PrivateTools.targets @@ -0,0 +1,43 @@ + + + + + $(MsvcurtC1xxToolsPath)HostX86\c1xx.dll + $(MsvcurtC1xxToolsPath)HostX64\c1xx.dll + + $(MsvcurtC1xxToolsPath)HostX86\c2.dll + $(MsvcurtC1xxToolsPath)HostX64\c2.dll + + + + + + + + %(AdditionalOptions) /Bx"$(FrontEndPath)" + + + %(AdditionalOptions) /fe:"$(FrontEndPath)" + + + + + + %(AdditionalOptions) /B2"$(BackEndPath)" + + + + diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props index 5624ab16cb0..5b83f7f792b 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props @@ -89,30 +89,10 @@ - - - - 0.0.0.4 - true - $(RepoRoot).tools\native\bin\msvcurt-c1xx\$(MsvcurtC1xxVersion)\$(Architecture)\ - $(MsvcurtC1xxToolsPath)msvcurt$(LibSuffix)_netcore.lib - + true + - - - %(AdditionalDependencies);$(MsvcurtNetCoreLib) - - - diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets index d2c806f217b..f14aa74b1f1 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets @@ -4,33 +4,8 @@ $([System.IO.Path]::GetDirectoryName($(NativeVersionFile))) - - - - - $(MsvcurtC1xxToolsPath)HostX86\c1xx.dll - $(MsvcurtC1xxToolsPath)HostX64\c1xx.dll - - $(MsvcurtC1xxToolsPath)HostX86\c2.dll - $(MsvcurtC1xxToolsPath)HostX64\c2.dll - - - - %(AdditionalOptions) /Bx"$(FrontEndPath)" - - - %(AdditionalOptions) /fe:"$(FrontEndPath)" - - - - - %(AdditionalOptions) /B2"$(BackEndPath)" - - - - + + %(AdditionalIncludeDirectories);$(WpfSharedDir)inc\ diff --git a/global.json b/global.json index d55984255ab..dd07e701741 100644 --- a/global.json +++ b/global.json @@ -19,6 +19,6 @@ "strawberry-perl": "5.28.1.1-1", "net-framework-48-ref-assemblies": "0.0.0.1", "dotnet-api-docs_netcoreapp3.0": "0.0.0.1", - "msvcurt-c1xx": "0.0.0.4" + "msvcurt-c1xx": "0.0.0.6" } } From 457a2717df528a6627a67c1939c13fe7f4a483f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2019 16:32:15 +0000 Subject: [PATCH 175/227] [master] Update dependencies from dotnet/arcade (#1377) * Update dependencies from https://github.com/dotnet/arcade build 20190724.2 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19374.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19374.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19374.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19374.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19374.2 * Update dependencies from https://github.com/dotnet/arcade build 20190725.2 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19375.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19375.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19375.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19375.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19375.2 --- eng/Version.Details.xml | 20 +++++------ eng/Versions.props | 6 ++-- eng/common/cross/armel/tizen-build-rootfs.sh | 0 eng/common/cross/armel/tizen-fetch.sh | 0 eng/common/cross/build-android-rootfs.sh | 0 eng/common/cross/build-rootfs.sh | 0 eng/common/darc-init.sh | 0 eng/common/dotnet-install.sh | 0 eng/common/init-tools-native.sh | 0 eng/common/internal-feed-operations.sh | 0 eng/common/native/common-library.sh | 0 eng/common/native/install-cmake.sh | 0 eng/common/performance/performance-setup.sh | 0 eng/common/pipeline-logging-functions.sh | 0 eng/common/post-build/darc-gather-drop.ps1 | 36 +++++++++++++++++++ .../channels/internal-servicing.yml | 23 ------------ .../channels/public-dev-release.yml | 24 ++----------- .../post-build/channels/public-release.yml | 23 ------------ .../channels/public-validation-release.yml | 26 ++------------ .../templates/post-build/darc-gather-drop.yml | 22 ++++++++++++ .../post-build/trigger-subscription.yml | 2 +- eng/common/tools.sh | 0 global.json | 4 +-- 23 files changed, 80 insertions(+), 106 deletions(-) mode change 100644 => 100755 eng/common/cross/armel/tizen-build-rootfs.sh mode change 100644 => 100755 eng/common/cross/armel/tizen-fetch.sh mode change 100644 => 100755 eng/common/cross/build-android-rootfs.sh mode change 100644 => 100755 eng/common/cross/build-rootfs.sh mode change 100644 => 100755 eng/common/darc-init.sh mode change 100644 => 100755 eng/common/dotnet-install.sh mode change 100644 => 100755 eng/common/init-tools-native.sh mode change 100644 => 100755 eng/common/internal-feed-operations.sh mode change 100644 => 100755 eng/common/native/common-library.sh mode change 100644 => 100755 eng/common/native/install-cmake.sh mode change 100644 => 100755 eng/common/performance/performance-setup.sh mode change 100644 => 100755 eng/common/pipeline-logging-functions.sh create mode 100644 eng/common/post-build/darc-gather-drop.ps1 create mode 100644 eng/common/templates/post-build/darc-gather-drop.yml mode change 100644 => 100755 eng/common/tools.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 479284114cb..4bf676af313 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 5d8d5e866113c9f144136a04222f191456dfff1d - + https://github.com/dotnet/arcade - 6552a851638e292f187bb98fb88ae8b463336cd3 + 3dfa62fddcde597959c323d17426f215384e773a - + https://github.com/dotnet/arcade - 6552a851638e292f187bb98fb88ae8b463336cd3 + 3dfa62fddcde597959c323d17426f215384e773a https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr c01a9a157d512343ef104bb2b1f97b356e708b11 - + https://github.com/dotnet/arcade - 6552a851638e292f187bb98fb88ae8b463336cd3 + 3dfa62fddcde597959c323d17426f215384e773a - + https://github.com/dotnet/arcade - 6552a851638e292f187bb98fb88ae8b463336cd3 + 3dfa62fddcde597959c323d17426f215384e773a - + https://github.com/dotnet/arcade - 6552a851638e292f187bb98fb88ae8b463336cd3 + 3dfa62fddcde597959c323d17426f215384e773a diff --git a/eng/Versions.props b/eng/Versions.props index ba9ee866012..b8382d24a0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19373.4 - 1.0.0-beta.19373.4 - 1.0.0-beta.19373.4 + 1.0.0-beta.19375.2 + 1.0.0-beta.19375.2 + 1.0.0-beta.19375.2 diff --git a/eng/common/cross/armel/tizen-build-rootfs.sh b/eng/common/cross/armel/tizen-build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/armel/tizen-fetch.sh b/eng/common/cross/armel/tizen-fetch.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh old mode 100644 new mode 100755 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh old mode 100644 new mode 100755 diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh old mode 100644 new mode 100755 diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh old mode 100644 new mode 100755 diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh old mode 100644 new mode 100755 diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh old mode 100644 new mode 100755 diff --git a/eng/common/post-build/darc-gather-drop.ps1 b/eng/common/post-build/darc-gather-drop.ps1 new file mode 100644 index 00000000000..9cc2f1a0091 --- /dev/null +++ b/eng/common/post-build/darc-gather-drop.ps1 @@ -0,0 +1,36 @@ +param( + [Parameter(Mandatory=$true)][string] $BarBuildId, # ID of the build which assets should be downloaded + [Parameter(Mandatory=$true)][string] $MaestroAccessToken, # Token used to access Maestro API + [Parameter(Mandatory=$true)][string] $DropLocation # Where the assets should be downloaded to +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +. $PSScriptRoot\..\tools.ps1 + +try { + Write-Host "Installing DARC ..." + + . $PSScriptRoot\..\darc-init.ps1 + $exitCode = $LASTEXITCODE + + if ($exitCode -ne 0) { + Write-PipelineTaskError "Something failed while running 'darc-init.ps1'. Check for errors above. Exiting now..." + ExitWithExitCode $exitCode + } + + darc gather-drop --non-shipping ` + --continue-on-error ` + --id $BarBuildId ` + --output-dir $DropLocation ` + --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ ` + --password $MaestroAccessToken ` + --latest-location +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml index 648e854e0ed..5c07b66926f 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -143,29 +143,6 @@ stages: filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - job: - displayName: Gather Drop - dependsOn: setupMaestroVars - variables: - BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Setup Darc CLI - inputs: - targetType: filePath - filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' - - - task: PowerShell@2 - displayName: Run Darc gather-drop - inputs: - targetType: inline - script: | - darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location - enabled: false - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index bdc631016b6..b46b0699233 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -140,27 +140,9 @@ stages: filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - job: - displayName: Gather Drop - dependsOn: setupMaestroVars - variables: - BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Setup Darc CLI - inputs: - targetType: filePath - filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' - - - task: PowerShell@2 - displayName: Run Darc gather-drop - inputs: - targetType: inline - script: | - darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location + - template: ../darc-gather-drop.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} - template: ../promote-build.yml parameters: diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml index f6a7efdfe9d..a31d37139b7 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -143,29 +143,6 @@ stages: filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - job: - displayName: Gather Drop - dependsOn: setupMaestroVars - variables: - BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Setup Darc CLI - inputs: - targetType: filePath - filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' - - - task: PowerShell@2 - displayName: Run Darc gather-drop - inputs: - targetType: inline - script: | - darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location - enabled: false - - template: ../promote-build.yml parameters: ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index f12f402ad9a..02dae0937da 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -91,29 +91,9 @@ stages: jobs: - template: ../setup-maestro-vars.yml - - job: - displayName: Gather Drop - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - group: Publish-Build-Assets - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Setup Darc CLI - inputs: - targetType: filePath - filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1' - - - task: PowerShell@2 - displayName: Run Darc gather-drop - inputs: - targetType: inline - script: | - darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) --latest-location + - template: ../darc-gather-drop.yml + parameters: + ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} - template: ../promote-build.yml parameters: diff --git a/eng/common/templates/post-build/darc-gather-drop.yml b/eng/common/templates/post-build/darc-gather-drop.yml new file mode 100644 index 00000000000..e0a9f0a6d26 --- /dev/null +++ b/eng/common/templates/post-build/darc-gather-drop.yml @@ -0,0 +1,22 @@ +parameters: + ChannelId: 0 + +jobs: +- job: gatherDrop + displayName: Gather Drop + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) + variables: + - group: Publish-Build-Assets + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Darc gather-drop + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/darc-gather-drop.ps1 + arguments: -BarBuildId $(BARBuildId) + -DropLocation $(Agent.BuildDirectory)/Temp/Drop/ + -MaestroAccessToken $(MaestroAccessToken) diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml index 65259d4e685..3915cdcd1ad 100644 --- a/eng/common/templates/post-build/trigger-subscription.yml +++ b/eng/common/templates/post-build/trigger-subscription.yml @@ -8,4 +8,4 @@ steps: filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 arguments: -SourceRepo $(Build.Repository.Uri) -ChannelId ${{ parameters.ChannelId }} - -BarToken $(MaestroAccessTokenInt) \ No newline at end of file + -BarToken $(MaestroAccessToken) diff --git a/eng/common/tools.sh b/eng/common/tools.sh old mode 100644 new mode 100755 diff --git a/global.json b/global.json index dd07e701741..157861c6dc2 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19373.4", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19373.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19375.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19375.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 49e7edfd52c23820874d54d26fcebe82d674d874 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2019 19:21:17 +0000 Subject: [PATCH 176/227] Update dependencies from https://github.com/dotnet/winforms build 20190725.8 (#1383) - Microsoft.Private.Winforms - 4.8.0-preview8.19375.8 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28374-06 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bf676af313..a7eac06ad23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - f18f93d0163a3cca64634b6c7c424833b1659be0 + 4a53f062cdddf42f03281321546d0760950eaabb @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx d594cb2dbc5027d7e996491b0722c5be5204460f - + https://github.com/dotnet/core-setup - 5d8d5e866113c9f144136a04222f191456dfff1d + 3002d85a81dac020d101a02143f194eb20431cad https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index b8382d24a0b..f62d37b025a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19374.7 + 4.8.0-preview8.19375.8 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28373-17 + 3.0.0-preview8-28374-06 3.0.0-preview8.19372.8 4.6.0-preview8.19372.8 4.6.0-preview8.19372.8 From b71b8b339ce667d6e49ff08aea3bc8d148a1c851 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2019 20:36:37 +0000 Subject: [PATCH 177/227] Update dependencies from https://github.com/dotnet/winforms build 20190725.9 (#1384) - Microsoft.Private.Winforms - 4.8.0-preview8.19375.9 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-28375-05 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19374.10 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview8.19374.10 (parent: Microsoft.NETCore.App) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7eac06ad23..683e1487ec6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 4a53f062cdddf42f03281321546d0760950eaabb + d07c2b1196e24dbf0b9895233462a1f72fc1da1e - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 - + https://github.com/dotnet/core-setup - 3002d85a81dac020d101a02143f194eb20431cad + ba1889ede648b201b82d712f7479be9b86803ae8 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 3dfa62fddcde597959c323d17426f215384e773a - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int d6cdc6daf9ddfeee3731ca75c8205589195d7adb - + https://github.com/dotnet/corefx - d594cb2dbc5027d7e996491b0722c5be5204460f + 9235e2987bc8e4742508a6c8ff2033f709075643 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index f62d37b025a..ec100dc83fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19372.8 + 4.6.0-preview8.19374.10 - 4.8.0-preview8.19375.8 + 4.8.0-preview8.19375.9 @@ -18,25 +18,25 @@ - 3.0.0-preview8-28374-06 - 3.0.0-preview8.19372.8 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 + 3.0.0-preview8-28375-05 + 3.0.0-preview8.19374.10 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 4.6.0-preview4.19176.11 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 - 4.6.0-preview8.19372.8 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 + 4.6.0-preview8.19374.10 From 0e8db77b403aeccf3be7d121725ae314fdc0d6ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2019 22:51:06 +0000 Subject: [PATCH 178/227] Update dependencies from https://github.com/dotnet/winforms build 20190725.10 (#1389) - Microsoft.Private.Winforms - 4.8.0-preview8.19375.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 683e1487ec6..f35f93f2065 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - d07c2b1196e24dbf0b9895233462a1f72fc1da1e + b5112e1a79e1a00de9c714a7c96801320c09d075 diff --git a/eng/Versions.props b/eng/Versions.props index ec100dc83fd..3f8fc086bd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19375.9 + 4.8.0-preview8.19375.10 From dfbf410f8a080d31804b83685ce6791734dead00 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Thu, 25 Jul 2019 17:23:16 -0700 Subject: [PATCH 179/227] Linker hints for C++/CLI dependencies (#1387) * When producing ReadyToRun images, the ILLinker is configured to skip C++/CLI images. See mono/linker#651 and mono/linker#658. In turn, this results in a failure of dependencies of such assemblies (like System.Diagnostics.Debug.dll, which is required by DirectWriteForwarder.dll) from being identified and included in the ReadyToRun images. These linker hints tell ILLinker to include certain dependencies, which we know to be required by DirectWriteForwarder and System.Printing respectively. * Add netstandard and mscorlib to the list of dependencies --- .../src/PresentationCore/ILLinkTrim.xml | 7 ++++++ .../PresentationCore/PresentationCore.csproj | 23 +++++++++++++++++++ .../src/ReachFramework/ILLinkTrim.xml | 7 ++++++ .../src/ReachFramework/ReachFramework.csproj | 23 +++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml create mode 100644 src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml new file mode 100644 index 00000000000..a488f34ce05 --- /dev/null +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 1e14b2e0eb7..c01546b7fe3 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -1448,6 +1448,29 @@ false ColorProfiles + + + + false + $(AssemblyName).xml + + + + + diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj index c56f253f181..c2301de6145 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj @@ -21,6 +21,29 @@ System.Printing.resources System.Printing.resources + + + + false + $(AssemblyName).xml + From 09da95f26598d3620f4759bda3e4ced111d44c84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 02:16:26 +0000 Subject: [PATCH 180/227] Update dependencies from https://github.com/dotnet/winforms build 20190725.12 (#1394) - Microsoft.Private.Winforms - 4.8.0-preview8.19375.12 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-28375-11 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19375.8 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview8.19375.8 (parent: Microsoft.NETCore.App) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f35f93f2065..2f6c43ef146 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - b5112e1a79e1a00de9c714a7c96801320c09d075 + 9b46f425429bcf91b6825b152651bf0b2f1de809 - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c - + https://github.com/dotnet/core-setup - ba1889ede648b201b82d712f7479be9b86803ae8 + 3602cec09a9505b5b97609a68fed0be969753fd1 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 3dfa62fddcde597959c323d17426f215384e773a - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int d6cdc6daf9ddfeee3731ca75c8205589195d7adb - + https://github.com/dotnet/corefx - 9235e2987bc8e4742508a6c8ff2033f709075643 + 605ff91f856177f52e3fcb76f2e65696e520e41c https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 3f8fc086bd2..04dfa64d784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19374.10 + 4.6.0-preview8.19375.8 - 4.8.0-preview8.19375.10 + 4.8.0-preview8.19375.12 @@ -18,25 +18,25 @@ - 3.0.0-preview8-28375-05 - 3.0.0-preview8.19374.10 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 + 3.0.0-preview8-28375-11 + 3.0.0-preview8.19375.8 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 4.6.0-preview4.19176.11 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 - 4.6.0-preview8.19374.10 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.8 From 25c7f480f51f07849bef847894e7b703bd3be5d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 05:31:09 +0000 Subject: [PATCH 181/227] Update dependencies from https://github.com/dotnet/winforms build 20190725.13 (#1395) - Microsoft.Private.Winforms - 4.8.0-preview8.19375.13 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-28375-14 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19375.10 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview8.19375.10 (parent: Microsoft.NETCore.App) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f6c43ef146..b3ee96f8f81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 9b46f425429bcf91b6825b152651bf0b2f1de809 + ee6e9d1cc0cc9469054dec4ad114d7bea6d40576 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 - + https://github.com/dotnet/core-setup - 3602cec09a9505b5b97609a68fed0be969753fd1 + 8035a03e23b91216a1a2e180aa80b7238c17db69 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 3dfa62fddcde597959c323d17426f215384e773a - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int d6cdc6daf9ddfeee3731ca75c8205589195d7adb - + https://github.com/dotnet/corefx - 605ff91f856177f52e3fcb76f2e65696e520e41c + 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 04dfa64d784..fccdfba2a51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.10 - 4.8.0-preview8.19375.12 + 4.8.0-preview8.19375.13 @@ -18,25 +18,25 @@ - 3.0.0-preview8-28375-11 - 3.0.0-preview8.19375.8 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 + 3.0.0-preview8-28375-14 + 3.0.0-preview8.19375.10 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 4.6.0-preview4.19176.11 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 - 4.6.0-preview8.19375.8 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.10 From d25957a29bb92adfd4446ee164f231cb555d5d5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 07:11:17 +0000 Subject: [PATCH 182/227] Update dependencies from https://github.com/dotnet/winforms build 20190725.14 (#1397) - Microsoft.Private.Winforms - 4.8.0-preview8.19375.14 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-28375-17 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19375.12 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview8.19375.12 (parent: Microsoft.NETCore.App) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3ee96f8f81..6aa3f0755d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - ee6e9d1cc0cc9469054dec4ad114d7bea6d40576 + d87ffedb46827c572bd6f144a5710806edc9d4e2 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 - + https://github.com/dotnet/core-setup - 8035a03e23b91216a1a2e180aa80b7238c17db69 + 38853bc3d4c6c1d808b9644cc8351a6bca71534d https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 3dfa62fddcde597959c323d17426f215384e773a - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int d6cdc6daf9ddfeee3731ca75c8205589195d7adb - + https://github.com/dotnet/corefx - 75aaa7fa1a160fbf123db0e69f1f35f577267ea7 + fdd085ab856f728ee2edeaf48e132cb58f404140 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index fccdfba2a51..e1561e702ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.12 - 4.8.0-preview8.19375.13 + 4.8.0-preview8.19375.14 @@ -18,25 +18,25 @@ - 3.0.0-preview8-28375-14 - 3.0.0-preview8.19375.10 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 + 3.0.0-preview8-28375-17 + 3.0.0-preview8.19375.12 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 4.6.0-preview4.19176.11 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 - 4.6.0-preview8.19375.10 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.12 From a0ff0c95df3bb0c4495b45a0593eb0e8e65fec8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 09:41:29 +0000 Subject: [PATCH 183/227] Update dependencies from https://github.com/dotnet/winforms build 20190726.1 (#1398) - Microsoft.Private.Winforms - 4.8.0-preview8.19376.1 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-28375-21 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19375.15 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview8.19375.15 (parent: Microsoft.NETCore.App) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6aa3f0755d0..d80d7797e82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - d87ffedb46827c572bd6f144a5710806edc9d4e2 + 430bfa25def6cecdf1ff4baa5aeea11447a24413 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/core-setup - 38853bc3d4c6c1d808b9644cc8351a6bca71534d + af5fd53eedf24815157e0cee79bc201c7fcdaf38 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade 3dfa62fddcde597959c323d17426f215384e773a - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int d6cdc6daf9ddfeee3731ca75c8205589195d7adb - + https://github.com/dotnet/corefx - fdd085ab856f728ee2edeaf48e132cb58f404140 + ae28da289ecb09197cfc16b619db0fc1df86bc42 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index e1561e702ef..34e9716987e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.15 - 4.8.0-preview8.19375.14 + 4.8.0-preview8.19376.1 @@ -18,25 +18,25 @@ - 3.0.0-preview8-28375-17 - 3.0.0-preview8.19375.12 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 + 3.0.0-preview8-28375-21 + 3.0.0-preview8.19375.15 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 4.6.0-preview4.19176.11 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 - 4.6.0-preview8.19375.12 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 + 4.6.0-preview8.19375.15 From 3160d7908212923dfe7bbf69465fab77fe3352fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 13:26:32 +0000 Subject: [PATCH 184/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190726.4 (#1400) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19376.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d80d7797e82..c79a331d2b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - d6cdc6daf9ddfeee3731ca75c8205589195d7adb + 04f934068abb3a7f44bcd40c6cab2d6ca745e5c8 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 34e9716987e..4977eb0d918 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,6 +112,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19373.14 + 4.8.0-preview8.19376.4 From 961b587450db69533a98ba9afa9e7ed4b0542700 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 15:03:47 +0000 Subject: [PATCH 185/227] Update dependencies from https://github.com/dotnet/winforms build 20190726.3 (#1401) - Microsoft.Private.Winforms - 4.8.0-preview8.19376.3 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28376-04 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c79a331d2b9..5d11e9b1211 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 430bfa25def6cecdf1ff4baa5aeea11447a24413 + 3ee3021b4cc37116253abe733130a3360629ae73 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/core-setup - af5fd53eedf24815157e0cee79bc201c7fcdaf38 + d9cd39643013418ffa5190cf515633de19c57768 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 4977eb0d918..00b3a57cd36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19376.1 + 4.8.0-preview8.19376.3 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28375-21 + 3.0.0-preview8-28376-04 3.0.0-preview8.19375.15 4.6.0-preview8.19375.15 4.6.0-preview8.19375.15 From 08b721a42e495dc81d6471e5f26c65d8bbfe8794 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 16:26:04 +0000 Subject: [PATCH 186/227] Update dependencies from https://github.com/dotnet/winforms build 20190726.4 (#1403) - Microsoft.Private.Winforms - 4.8.0-preview8.19376.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d11e9b1211..f239ae2fae4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 3ee3021b4cc37116253abe733130a3360629ae73 + e0e0f0c28b678a34fd92dd850031c21b1278e760 diff --git a/eng/Versions.props b/eng/Versions.props index 00b3a57cd36..9a28f4e4f7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19376.3 + 4.8.0-preview8.19376.4 From b6ea3541a11dbccca84a82702add4977f2118673 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 17:05:21 +0000 Subject: [PATCH 187/227] Update dependencies from https://github.com/dotnet/arcade build 20190725.15 (#1399) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19375.15 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19375.15 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19375.15 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19375.15 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19375.15 --- eng/Version.Details.xml | 20 +++++------ eng/Versions.props | 6 ++-- eng/common/init-tools-native.ps1 | 2 +- eng/common/native/CommonLibrary.psm1 | 33 +++++++++++++++++-- .../channels/public-dev-release.yml | 2 +- .../channels/public-validation-release.yml | 2 +- eng/common/tools.sh | 4 +-- global.json | 4 +-- 8 files changed, 51 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f239ae2fae4..02a3e633353 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup d9cd39643013418ffa5190cf515633de19c57768 - + https://github.com/dotnet/arcade - 3dfa62fddcde597959c323d17426f215384e773a + ef1c110152df0d500fffb87878a86f88d1ca5295 - + https://github.com/dotnet/arcade - 3dfa62fddcde597959c323d17426f215384e773a + ef1c110152df0d500fffb87878a86f88d1ca5295 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr c01a9a157d512343ef104bb2b1f97b356e708b11 - + https://github.com/dotnet/arcade - 3dfa62fddcde597959c323d17426f215384e773a + ef1c110152df0d500fffb87878a86f88d1ca5295 - + https://github.com/dotnet/arcade - 3dfa62fddcde597959c323d17426f215384e773a + ef1c110152df0d500fffb87878a86f88d1ca5295 - + https://github.com/dotnet/arcade - 3dfa62fddcde597959c323d17426f215384e773a + ef1c110152df0d500fffb87878a86f88d1ca5295 diff --git a/eng/Versions.props b/eng/Versions.props index 9a28f4e4f7f..e9c1b023265 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19375.2 - 1.0.0-beta.19375.2 - 1.0.0-beta.19375.2 + 1.0.0-beta.19375.15 + 1.0.0-beta.19375.15 + 1.0.0-beta.19375.15 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index eaa05880c55..8cf18bcfeba 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -98,7 +98,7 @@ try { } Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $LocalInstallerArguments'" + Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" & $InstallerPath @LocalInstallerArguments if ($LASTEXITCODE -Ne "0") { $errMsg = "$ToolName installation failed" diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index 7a34c7e8a42..2a08d5246e7 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -59,9 +59,38 @@ function DownloadAndExtract { -Verbose:$Verbose if ($UnzipStatus -Eq $False) { - Write-Error "Unzip failed" - return $False + # Retry Download one more time with Force=true + $DownloadRetryStatus = CommonLibrary\Get-File -Uri $Uri ` + -Path $TempToolPath ` + -DownloadRetries 1 ` + -RetryWaitTimeInSeconds $RetryWaitTimeInSeconds ` + -Force:$True ` + -Verbose:$Verbose + + if ($DownloadRetryStatus -Eq $False) { + Write-Error "Last attempt of download failed as well" + return $False + } + + # Retry unzip again one more time with Force=true + $UnzipRetryStatus = CommonLibrary\Expand-Zip -ZipPath $TempToolPath ` + -OutputDirectory $InstallDirectory ` + -Force:$True ` + -Verbose:$Verbose + if ($UnzipRetryStatus -Eq $False) + { + Write-Error "Last attempt of unzip failed as well" + # Clean up partial zips and extracts + if (Test-Path $TempToolPath) { + Remove-Item $TempToolPath -Force + } + if (Test-Path $InstallDirectory) { + Remove-Item $InstallDirectory -Force -Recurse + } + return $False + } } + return $True } diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index b46b0699233..4eaa6e4ff0f 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -77,7 +77,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ChannelId=$(PublicDevRelease_30_Channel_Id) - /p:ArtifactsCategory=.NetCore + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 02dae0937da..8c4d8f6ef33 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -48,7 +48,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) - /p:ArtifactsCategory=.NetCoreValidation + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 0deb01c480b..738bb5669da 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -77,7 +77,7 @@ function ReadGlobalVersion { local pattern="\"$key\" *: *\"(.*)\"" if [[ ! $line =~ $pattern ]]; then - Write-PipelineTelemetryError -category 'InitializeTools' "Error: Cannot find \"$key\" in $global_json_file" + Write-PipelineTelemetryError -category 'InitializeToolset' "Error: Cannot find \"$key\" in $global_json_file" ExitWithExitCode 1 fi @@ -245,7 +245,7 @@ function InitializeNativeTools() { then local nativeArgs="" if [[ "$ci" == true ]]; then - nativeArgs="-InstallDirectory $tools_dir" + nativeArgs="--installDirectory $tools_dir" fi "$_script_dir/init-tools-native.sh" $nativeArgs fi diff --git a/global.json b/global.json index 157861c6dc2..c9bb74a1fd3 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19375.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19375.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19375.15", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19375.15" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 07960accc1c77505e69d99f14ed85ad4bc366cc8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 20:03:56 +0000 Subject: [PATCH 188/227] Update dependencies from https://github.com/dotnet/winforms build 20190726.6 (#1405) - Microsoft.Private.Winforms - 4.8.0-preview8.19376.6 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28376-11 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02a3e633353..2a13e13411e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - e0e0f0c28b678a34fd92dd850031c21b1278e760 + 7f1db25dbf376b7691176de9d0173aadb993a846 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx ae28da289ecb09197cfc16b619db0fc1df86bc42 - + https://github.com/dotnet/core-setup - d9cd39643013418ffa5190cf515633de19c57768 + 1b53a27bab56e10348b2cf368d398733e454a798 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e9c1b023265..2bb260ed5f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19376.4 + 4.8.0-preview8.19376.6 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28376-04 + 3.0.0-preview8-28376-11 3.0.0-preview8.19375.15 4.6.0-preview8.19375.15 4.6.0-preview8.19375.15 From ca89d1458c1e5c02209ae4e93afc245d832fc46e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 21:46:02 +0000 Subject: [PATCH 189/227] Update dependencies from https://github.com/dotnet/winforms build 20190726.7 (#1406) - Microsoft.Private.Winforms - 4.8.0-preview8.19376.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a13e13411e..d0d907c065f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 7f1db25dbf376b7691176de9d0173aadb993a846 + 6a8192ea056babf51af1cf2210f8abe5545b6172 diff --git a/eng/Versions.props b/eng/Versions.props index 2bb260ed5f0..c5d5ba33b19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19376.6 + 4.8.0-preview8.19376.7 From b14b9fe99f9a17858e7accba4bbc3644c58878e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 01:51:13 +0000 Subject: [PATCH 190/227] Update dependencies from https://github.com/dotnet/winforms build 20190726.8 (#1407) - Microsoft.Private.Winforms - 4.8.0-preview8.19376.8 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-28376-20 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19376.3 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview8.19376.3 (parent: Microsoft.NETCore.App) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0d907c065f..00553ac9bf2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 6a8192ea056babf51af1cf2210f8abe5545b6172 + b2db558e925850a3dffe7f9fe4cecded9b452777 - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/core-setup - 1b53a27bab56e10348b2cf368d398733e454a798 + 6af38299e2a4bf1f622d8a82f946a61846094377 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade ef1c110152df0d500fffb87878a86f88d1ca5295 - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 04f934068abb3a7f44bcd40c6cab2d6ca745e5c8 - + https://github.com/dotnet/corefx - ae28da289ecb09197cfc16b619db0fc1df86bc42 + b56e8980c8f9b203cabca520f6a00d5db55ab85e https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index c5d5ba33b19..a698543c378 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19375.15 + 4.6.0-preview8.19376.3 - 4.8.0-preview8.19376.7 + 4.8.0-preview8.19376.8 @@ -18,25 +18,25 @@ - 3.0.0-preview8-28376-11 - 3.0.0-preview8.19375.15 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 + 3.0.0-preview8-28376-20 + 3.0.0-preview8.19376.3 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 4.6.0-preview4.19176.11 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 - 4.6.0-preview8.19375.15 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.3 From 1be6b9b477d091d09678884bde2a3bb457119d2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 04:31:28 +0000 Subject: [PATCH 191/227] Update dependencies from https://github.com/dotnet/winforms build 20190726.9 (#1409) - Microsoft.Private.Winforms - 4.8.0-preview8.19376.9 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28376-22 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00553ac9bf2..ee869132b8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - b2db558e925850a3dffe7f9fe4cecded9b452777 + ca0da83dbced740f1c57c04f97280c12c9d6f471 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx b56e8980c8f9b203cabca520f6a00d5db55ab85e - + https://github.com/dotnet/core-setup - 6af38299e2a4bf1f622d8a82f946a61846094377 + cbdad6ea860e27bdc900ff7e4c95c79e047c8acc https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index a698543c378..cb040f9aff0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19376.8 + 4.8.0-preview8.19376.9 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28376-20 + 3.0.0-preview8-28376-22 3.0.0-preview8.19376.3 4.6.0-preview8.19376.3 4.6.0-preview8.19376.3 From 35f385f0fc9eea83feedd051131e64e3476881fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 05:11:10 +0000 Subject: [PATCH 192/227] Update dependencies from https://github.com/dotnet/winforms build 20190726.10 (#1410) - Microsoft.Private.Winforms - 4.8.0-preview8.19376.10 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-28376-23 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19376.12 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview8.19376.12 (parent: Microsoft.NETCore.App) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee869132b8c..100f97cacf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - ca0da83dbced740f1c57c04f97280c12c9d6f471 + 94ac5e6f7a5b7d17a2c0769e721259d06a6095b7 - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - cbdad6ea860e27bdc900ff7e4c95c79e047c8acc + 281e6413e7dee99563b580842c5038437a333da8 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade ef1c110152df0d500fffb87878a86f88d1ca5295 - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 04f934068abb3a7f44bcd40c6cab2d6ca745e5c8 - + https://github.com/dotnet/corefx - b56e8980c8f9b203cabca520f6a00d5db55ab85e + 91424da223c9027e7e875f1ef5d73c3c9ea88bdd https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index cb040f9aff0..20d885a5a9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.12 - 4.8.0-preview8.19376.9 + 4.8.0-preview8.19376.10 @@ -18,25 +18,25 @@ - 3.0.0-preview8-28376-22 - 3.0.0-preview8.19376.3 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 + 3.0.0-preview8-28376-23 + 3.0.0-preview8.19376.12 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 4.6.0-preview4.19176.11 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 - 4.6.0-preview8.19376.3 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 + 4.6.0-preview8.19376.12 From 238e6ec4bc08fe9b6809e9174c70e8cbe07033ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 09:06:10 +0000 Subject: [PATCH 193/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.1 (#1411) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.1 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28376-27 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 100f97cacf1..707023d21bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 94ac5e6f7a5b7d17a2c0769e721259d06a6095b7 + d0e98751a2667b06b561a3d6339b6d0069953739 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 281e6413e7dee99563b580842c5038437a333da8 + 915ee5932c173399827d918f5176b7fc4baf4454 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 20d885a5a9e..26aa805a21f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19376.10 + 4.8.0-preview8.19377.1 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28376-23 + 3.0.0-preview8-28376-27 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From eb9277768d3801e43624c5d95458137876ed3968 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 09:56:10 +0000 Subject: [PATCH 194/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.2 (#1412) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.2 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28376-29 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 707023d21bb..85b4d2bee0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - d0e98751a2667b06b561a3d6339b6d0069953739 + 746d02c27079e18da9d458b72584345bf8b78c1b @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 915ee5932c173399827d918f5176b7fc4baf4454 + bd44f59e21537ce560d6924805a222f13c009bcb https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 26aa805a21f..20ca58342cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.1 + 4.8.0-preview8.19377.2 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28376-27 + 3.0.0-preview8-28376-29 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From d96f862eeaeabe176f536bd8bb947921478c825d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 12:42:55 +0000 Subject: [PATCH 195/227] Update dependencies from https://github.com/dotnet/arcade build 20190726.18 (#1413) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19376.18 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19376.18 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19376.18 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19376.18 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19376.18 --- eng/Version.Details.xml | 20 ++--- eng/Versions.props | 6 +- eng/common/post-build/darc-gather-drop.ps1 | 17 ++-- eng/common/post-build/nuget-validation.ps1 | 5 +- eng/common/post-build/post-build-utils.ps1 | 90 +++++++++++++++++++ eng/common/post-build/promote-build.ps1 | 37 ++++---- eng/common/post-build/setup-maestro-vars.ps1 | 26 ++++++ .../post-build/sourcelink-validation.ps1 | 31 ++++--- eng/common/post-build/symbols-validation.ps1 | 29 +++--- .../post-build/trigger-subscriptions.ps1 | 48 ++++------ .../channels/internal-servicing.yml | 5 +- .../channels/public-dev-release.yml | 5 +- .../post-build/channels/public-release.yml | 5 +- .../channels/public-validation-release.yml | 9 +- .../templates/post-build/common-variables.yml | 34 +++++-- .../templates/post-build/darc-gather-drop.yml | 5 +- .../templates/post-build/post-build.yml | 5 +- .../templates/post-build/promote-build.yml | 5 +- .../post-build/setup-maestro-vars.yml | 21 +---- .../post-build/trigger-subscription.yml | 4 +- global.json | 4 +- 21 files changed, 258 insertions(+), 153 deletions(-) create mode 100644 eng/common/post-build/post-build-utils.ps1 create mode 100644 eng/common/post-build/setup-maestro-vars.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85b4d2bee0e..45a6cfbf50b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup bd44f59e21537ce560d6924805a222f13c009bcb - + https://github.com/dotnet/arcade - ef1c110152df0d500fffb87878a86f88d1ca5295 + 316481e57ee5e6acbbf2401eb6778a1d3d48d25b - + https://github.com/dotnet/arcade - ef1c110152df0d500fffb87878a86f88d1ca5295 + 316481e57ee5e6acbbf2401eb6778a1d3d48d25b https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr c01a9a157d512343ef104bb2b1f97b356e708b11 - + https://github.com/dotnet/arcade - ef1c110152df0d500fffb87878a86f88d1ca5295 + 316481e57ee5e6acbbf2401eb6778a1d3d48d25b - + https://github.com/dotnet/arcade - ef1c110152df0d500fffb87878a86f88d1ca5295 + 316481e57ee5e6acbbf2401eb6778a1d3d48d25b - + https://github.com/dotnet/arcade - ef1c110152df0d500fffb87878a86f88d1ca5295 + 316481e57ee5e6acbbf2401eb6778a1d3d48d25b diff --git a/eng/Versions.props b/eng/Versions.props index 20ca58342cb..b126f47d651 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19375.15 - 1.0.0-beta.19375.15 - 1.0.0-beta.19375.15 + 1.0.0-beta.19376.18 + 1.0.0-beta.19376.18 + 1.0.0-beta.19376.18 diff --git a/eng/common/post-build/darc-gather-drop.ps1 b/eng/common/post-build/darc-gather-drop.ps1 index 9cc2f1a0091..93a0bd83285 100644 --- a/eng/common/post-build/darc-gather-drop.ps1 +++ b/eng/common/post-build/darc-gather-drop.ps1 @@ -1,13 +1,12 @@ param( - [Parameter(Mandatory=$true)][string] $BarBuildId, # ID of the build which assets should be downloaded - [Parameter(Mandatory=$true)][string] $MaestroAccessToken, # Token used to access Maestro API - [Parameter(Mandatory=$true)][string] $DropLocation # Where the assets should be downloaded to + [Parameter(Mandatory=$true)][int] $BarBuildId, # ID of the build which assets should be downloaded + [Parameter(Mandatory=$true)][string] $DropLocation, # Where the assets should be downloaded to + [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, # Token used to access Maestro API + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = "https://maestro-prod.westus2.cloudapp.azure.com", # Maestro API URL + [Parameter(Mandatory=$false)][string] $MaestroApiVersion = "2019-01-16" # Version of Maestro API to use ) -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 +. $PSScriptRoot\post-build-utils.ps1 try { Write-Host "Installing DARC ..." @@ -24,8 +23,8 @@ try { --continue-on-error ` --id $BarBuildId ` --output-dir $DropLocation ` - --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ ` - --password $MaestroAccessToken ` + --bar-uri $MaestroApiEndpoint ` + --password $MaestroApiAccessToken ` --latest-location } catch { diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index 1bdced1e307..78ed0d540f5 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -6,10 +6,7 @@ param( [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to ) -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 +. $PSScriptRoot\post-build-utils.ps1 try { $url = "https://raw.githubusercontent.com/NuGet/NuGetGallery/jver-verify/src/VerifyMicrosoftPackage/verify.ps1" diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 new file mode 100644 index 00000000000..551ae113f89 --- /dev/null +++ b/eng/common/post-build/post-build-utils.ps1 @@ -0,0 +1,90 @@ +# Most of the functions in this file require the variables `MaestroApiEndPoint`, +# `MaestroApiVersion` and `MaestroApiAccessToken` to be globally available. + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +. $PSScriptRoot\..\tools.ps1 + +function Create-MaestroApiRequestHeaders([string]$ContentType = "application/json") { + Validate-MaestroVars + + $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $headers.Add('Accept', $ContentType) + $headers.Add('Authorization',"Bearer $MaestroApiAccessToken") + return $headers +} + +function Get-MaestroChannel([int]$ChannelId) { + Validate-MaestroVars + + $apiHeaders = Create-MaestroApiRequestHeaders + $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion" + + $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + return $result +} + +function Get-MaestroBuild([int]$BuildId) { + Validate-MaestroVars + + $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken + $apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion" + + $result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + return $result +} + +function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) { + Validate-MaestroVars + + $SourceRepository = [System.Web.HttpUtility]::UrlEncode($SourceRepository) + $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken + $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion" + + $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + return $result +} + +function Trigger-Subscription([string]$SubscriptionId) { + Validate-MaestroVars + + $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken + $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion" + Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null +} + +function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) { + Validate-MaestroVars + + $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken + $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion" + Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null +} + +function Validate-MaestroVars { + try { + Get-Variable MaestroApiEndPoint -Scope Global | Out-Null + Get-Variable MaestroApiVersion -Scope Global | Out-Null + Get-Variable MaestroApiAccessToken -Scope Global | Out-Null + + if (!($MaestroApiEndPoint -Match "^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$")) { + Write-PipelineTaskError "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'" + ExitWithExitCode 1 + } + + if (!($MaestroApiVersion -Match "^[0-9]{4}-[0-9]{2}-[0-9]{2}$")) { + Write-PipelineTaskError "MaestroApiVersion does not match a version string in the format yyyy-MM-DD. '$MaestroApiVersion'" + ExitWithExitCode 1 + } + } + catch { + Write-PipelineTaskError "Error: Variables `MaestroApiEndPoint`, `MaestroApiVersion` and `MaestroApiAccessToken` are required while using this script." + Write-Host $_ + ExitWithExitCode 1 + } +} diff --git a/eng/common/post-build/promote-build.ps1 b/eng/common/post-build/promote-build.ps1 index 84a608fa569..e5ae85f2517 100644 --- a/eng/common/post-build/promote-build.ps1 +++ b/eng/common/post-build/promote-build.ps1 @@ -1,30 +1,25 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, - [Parameter(Mandatory=$true)][string] $BarToken, - [string] $MaestroEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com", - [string] $ApiVersion = "2019-01-16" + [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = "https://maestro-prod.westus2.cloudapp.azure.com", + [Parameter(Mandatory=$false)][string] $MaestroApiVersion = "2019-01-16" ) -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 - -function Get-Headers([string]$accept, [string]$barToken) { - $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $headers.Add('Accept',$accept) - $headers.Add('Authorization',"Bearer $barToken") - return $headers -} +. $PSScriptRoot\post-build-utils.ps1 try { - $maestroHeaders = Get-Headers 'application/json' $BarToken + # Check that the channel we are going to promote the build to exist + $channelInfo = Get-MaestroChannel -ChannelId $ChannelId - # Get info about which channels the build has already been promoted to - $getBuildApiEndpoint = "$MaestroEndpoint/api/builds/${BuildId}?api-version=$ApiVersion" - $buildInfo = Invoke-WebRequest -Method Get -Uri $getBuildApiEndpoint -Headers $maestroHeaders | ConvertFrom-Json + if (!$channelInfo) { + Write-Host "Channel with BAR ID $ChannelId was not found in BAR!" + ExitWithExitCode 1 + } + # Get info about which channels the build has already been promoted to + $buildInfo = Get-MaestroBuild -BuildId $BuildId + if (!$buildInfo) { Write-Host "Build with BAR ID $BuildId was not found in BAR!" ExitWithExitCode 1 @@ -40,10 +35,10 @@ try { } } - Write-Host "Build not present in channel $ChannelId. Promoting build ... " + Write-Host "Promoting build '$BuildId' to channel '$ChannelId'." + + Assign-BuildToChannel -BuildId $BuildId -ChannelId $ChannelId - $promoteBuildApiEndpoint = "$maestroEndpoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$ApiVersion" - Invoke-WebRequest -Method Post -Uri $promoteBuildApiEndpoint -Headers $maestroHeaders Write-Host "done." } catch { diff --git a/eng/common/post-build/setup-maestro-vars.ps1 b/eng/common/post-build/setup-maestro-vars.ps1 new file mode 100644 index 00000000000..d7f64dc63cb --- /dev/null +++ b/eng/common/post-build/setup-maestro-vars.ps1 @@ -0,0 +1,26 @@ +param( + [Parameter(Mandatory=$true)][string] $ReleaseConfigsPath # Full path to ReleaseConfigs.txt asset +) + +. $PSScriptRoot\post-build-utils.ps1 + +try { + $Content = Get-Content $ReleaseConfigsPath + + $BarId = $Content | Select -Index 0 + + $Channels = "" + $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } + + $IsStableBuild = $Content | Select -Index 2 + + Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId + Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" + Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild +} +catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + ExitWithExitCode 1 +} diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 8abd684e9e5..41e01ae6e67 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -6,10 +6,7 @@ param( [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use ) -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 +. $PSScriptRoot\post-build-utils.ps1 # Cache/HashMap (File -> Exist flag) used to consult whether a file exist # in the repository at a specific commit point. This is populated by inserting @@ -200,21 +197,27 @@ function ValidateSourceLinkLinks { } } -function CheckExitCode ([string]$stage) { - $exitCode = $LASTEXITCODE - if ($exitCode -ne 0) { - Write-PipelineTaskError "Something failed while '$stage'. Check for errors above. Exiting now..." - ExitWithExitCode $exitCode +function InstallSourcelinkCli { + $sourcelinkCliPackageName = "sourcelink" + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list --global + + if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) { + Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed." + } + else { + Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..." + Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." + & "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity "minimal" --global } } try { - Write-Host "Installing SourceLink CLI..." - Get-Location - . $PSScriptRoot\sourcelink-cli-init.ps1 -sourcelinkCliVersion $SourcelinkCliVersion - CheckExitCode "Running sourcelink-cli-init" + InstallSourcelinkCli - Measure-Command { ValidateSourceLinkLinks } + ValidateSourceLinkLinks } catch { Write-Host $_ diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 69456854e04..d5ec51b150f 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -4,10 +4,7 @@ param( [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion # Version of dotnet symbol to use ) -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 +. $PSScriptRoot\post-build-utils.ps1 Add-Type -AssemblyName System.IO.Compression.FileSystem @@ -162,19 +159,25 @@ function CheckSymbolsAvailable { } } -function CheckExitCode ([string]$stage) { - $exitCode = $LASTEXITCODE - if ($exitCode -ne 0) { - Write-PipelineTaskError "Something failed while '$stage'. Check for errors above. Exiting now..." - ExitWithExitCode $exitCode +function Installdotnetsymbol { + $dotnetsymbolPackageName = "dotnet-symbol" + + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + $toolList = & "$dotnet" tool list --global + + if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) { + Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed." + } + else { + Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..." + Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." + & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity "minimal" --global } } try { - Write-Host "Installing dotnet symbol ..." - Get-Location - . $PSScriptRoot\dotnetsymbol-init.ps1 -dotnetsymbolVersion $DotnetSymbolVersion - CheckExitCode "Running dotnetsymbol-init" + Installdotnetsymbol CheckSymbolsAvailable } diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 1a91dab0371..926d5b45513 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -1,33 +1,20 @@ -param( +param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, - [string] $MaestroEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com", - [string] $BarToken, - [string] $ApiVersion = "2019-01-16" + [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = "https://maestro-prod.westus2.cloudapp.azure.com", + [Parameter(Mandatory=$false)][string] $MaestroApiVersion = "2019-01-16" ) -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 - -function Get-Headers([string]$accept, [string]$barToken) { - $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $headers.Add('Accept',$accept) - $headers.Add('Authorization',"Bearer $barToken") - return $headers -} +. $PSScriptRoot\post-build-utils.ps1 # Get all the $SourceRepo subscriptions $normalizedSourceRepo = $SourceRepo.Replace('dnceng@', '') -$getSubscriptionsApiEndpoint = "$maestroEndpoint/api/subscriptions?sourceRepository=$normalizedSourceRepo&api-version=$apiVersion" -$headers = Get-Headers 'application/json' $barToken - -$subscriptions = Invoke-WebRequest -Uri $getSubscriptionsApiEndpoint -Headers $headers | ConvertFrom-Json +$subscriptions = Get-MaestroSubscriptions -SourceRepository $normalizedSourceRepo -ChannelId $ChannelId if (!$subscriptions) { Write-Host "No subscriptions found for source repo '$normalizedSourceRepo' in channel '$ChannelId'" - return + ExitWithExitCode 0 } $subscriptionsToTrigger = New-Object System.Collections.Generic.List[string] @@ -36,21 +23,18 @@ $failedTriggeredSubscription = $false # Get all enabled subscriptions that need dependency flow on 'everyBuild' foreach ($subscription in $subscriptions) { if ($subscription.enabled -and $subscription.policy.updateFrequency -like 'everyBuild' -and $subscription.channel.id -eq $ChannelId) { - Write-Host "$subscription.id" + Write-Host "Should trigger this subscription: $subscription.id" [void]$subscriptionsToTrigger.Add($subscription.id) } } foreach ($subscriptionToTrigger in $subscriptionsToTrigger) { try { - $triggerSubscriptionApiEndpoint = "$maestroEndpoint/api/subscriptions/$subscriptionToTrigger/trigger?api-version=$apiVersion" - $headers = Get-Headers 'application/json' $BarToken - - Write-Host "Triggering subscription '$subscriptionToTrigger'..." + Write-Host "Triggering subscription '$subscriptionToTrigger'." - Invoke-WebRequest -Uri $triggerSubscriptionApiEndpoint -Headers $headers -Method Post + Trigger-Subscription -SubscriptionId $subscriptionToTrigger - Write-Host "Subscription '$subscriptionToTrigger' triggered!" + Write-Host "done." } catch { @@ -61,9 +45,13 @@ foreach ($subscriptionToTrigger in $subscriptionsToTrigger) { } } -if ($failedTriggeredSubscription) { +if ($subscriptionsToTrigger.Count -eq 0) { + Write-Host "No subscription matched source repo '$normalizedSourceRepo' and channel ID '$ChannelId'." +} +elseif ($failedTriggeredSubscription) { Write-Host "At least one subscription failed to be triggered..." ExitWithExitCode 1 } - -Write-Host "All subscriptions were triggered successfully!" +else { + Write-Host "All subscriptions were triggered successfully!" +} diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml index 5c07b66926f..12fd2b4653d 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -41,7 +41,6 @@ stages: dependsOn: setupMaestroVars variables: - group: DotNet-Blob-Feed - - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] @@ -87,8 +86,8 @@ stages: /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' - /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index 4eaa6e4ff0f..b0f085b1420 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -41,7 +41,6 @@ stages: dependsOn: setupMaestroVars variables: - group: DotNet-Blob-Feed - - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] @@ -87,8 +86,8 @@ stages: /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' - /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml index a31d37139b7..4c63fb43f0c 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -41,7 +41,6 @@ stages: dependsOn: setupMaestroVars variables: - group: DotNet-Blob-Feed - - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] @@ -87,8 +86,8 @@ stages: /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' - /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 8c4d8f6ef33..1089ac5fa6b 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -12,7 +12,6 @@ stages: dependsOn: setupMaestroVars variables: - group: DotNet-Blob-Feed - - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] @@ -48,7 +47,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) + /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) @@ -58,13 +57,13 @@ stages: /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com' - /p:BuildAssetRegistryToken='$(MaestroAccessToken)' + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' /p:Configuration=Release - + - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 42df4ae77e3..bd0bc5e4daa 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,21 +1,39 @@ variables: + - group: Publish-Build-Assets + # .NET Core 3 Dev - PublicDevRelease_30_Channel_Id: 3 + - name: PublicDevRelease_30_Channel_Id + value: 3 # .NET Tools - Validation - PublicValidationRelease_30_Channel_Id: 9 + - name: PublicValidationRelease_30_Channel_Id + value: 9 # .NET Core 3.0 Internal Servicing - InternalServicing_30_Channel_Id: 184 + - name: InternalServicing_30_Channel_Id + value: 184 # .NET Core 3.0 Release - PublicRelease_30_Channel_Id: 19 + - name: PublicRelease_30_Channel_Id + value: 19 # Whether the build is internal or not - IsInternalBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} # Storage account name for proxy-backed feeds - ProxyBackedFeedsAccountName: dotnetfeed + - name: ProxyBackedFeedsAccountName + value: dotnetfeed + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro-prod.westus2.cloudapp.azure.com" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2019-01-16" - SourceLinkCLIVersion: 3.0.0 - SymbolToolVersion: 1.0.1 + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 diff --git a/eng/common/templates/post-build/darc-gather-drop.yml b/eng/common/templates/post-build/darc-gather-drop.yml index e0a9f0a6d26..f4e3bfcf5cd 100644 --- a/eng/common/templates/post-build/darc-gather-drop.yml +++ b/eng/common/templates/post-build/darc-gather-drop.yml @@ -7,7 +7,6 @@ jobs: dependsOn: setupMaestroVars condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) variables: - - group: Publish-Build-Assets - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] pool: @@ -19,4 +18,6 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/darc-gather-drop.ps1 arguments: -BarBuildId $(BARBuildId) -DropLocation $(Agent.BuildDirectory)/Temp/Drop/ - -MaestroAccessToken $(MaestroAccessToken) + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index daa799259c7..0872db4ed94 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -7,9 +7,12 @@ parameters: enable: false params: '' + # Which stages should finish execution before post-build stages start + dependsOn: [build] + stages: - stage: validate - dependsOn: build + dependsOn: ${{ parameters.dependsOn }} displayName: Validate jobs: - ${{ if eq(parameters.enableNugetValidation, 'true') }}: diff --git a/eng/common/templates/post-build/promote-build.yml b/eng/common/templates/post-build/promote-build.yml index af48b0b339e..9387c583b31 100644 --- a/eng/common/templates/post-build/promote-build.yml +++ b/eng/common/templates/post-build/promote-build.yml @@ -11,7 +11,6 @@ jobs: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: ChannelId value: ${{ parameters.ChannelId }} - - group: Publish-Build-Assets pool: vmImage: 'windows-2019' steps: @@ -21,4 +20,6 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1 arguments: -BuildId $(BARBuildId) -ChannelId $(ChannelId) - -BarToken $(MaestroAccessToken) + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index f6120dc1e1c..56242b068e1 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -14,22 +14,5 @@ jobs: name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - script: | - # This is needed to make Write-PipelineSetVariable works in this context - $ci = $true - - . "$(Build.SourcesDirectory)/eng/common/tools.ps1" - - $Content = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - - $BarId = $Content | Select -Index 0 - - $Channels = "" - $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } - - $IsStableBuild = $Content | Select -Index 2 - - Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId - Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels" - Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild + filePath: $(Build.SourcesDirectory)/eng/common/post-build/setup-maestro-vars.ps1 + arguments: -ReleaseConfigsPath '$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt' diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml index 3915cdcd1ad..da669030daf 100644 --- a/eng/common/templates/post-build/trigger-subscription.yml +++ b/eng/common/templates/post-build/trigger-subscription.yml @@ -8,4 +8,6 @@ steps: filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 arguments: -SourceRepo $(Build.Repository.Uri) -ChannelId ${{ parameters.ChannelId }} - -BarToken $(MaestroAccessToken) + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/global.json b/global.json index c9bb74a1fd3..fdf89b904b8 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19375.15", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19375.15" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19376.18", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19376.18" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 5c2a39b2db22aafe34a94633870e843a2b154817 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 13:20:33 +0000 Subject: [PATCH 196/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190727.2 (#1414) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19377.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45a6cfbf50b..068efb28907 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 04f934068abb3a7f44bcd40c6cab2d6ca745e5c8 + c012221298afc68c7ef75c11e3167a263a665bf8 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index b126f47d651..d9f15fbdded 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,6 +112,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19376.4 + 4.8.0-preview8.19377.2 From 60deeb253be7893d8024019d5214c7e566f259f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 13:52:25 +0000 Subject: [PATCH 197/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.3 (#1415) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 068efb28907..78d19f410c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 746d02c27079e18da9d458b72584345bf8b78c1b + 0566798afb3b6b65a3b29ec3d17146d251d83c9f diff --git a/eng/Versions.props b/eng/Versions.props index d9f15fbdded..eb9d33305f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.2 + 4.8.0-preview8.19377.3 From de55817cff2b6ea89359857d1f1917ddd4861d8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 14:46:10 +0000 Subject: [PATCH 198/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.4 (#1416) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28377-01 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78d19f410c4..175eef9ad4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 0566798afb3b6b65a3b29ec3d17146d251d83c9f + a84b2df2b968a8420bb3be806e7d13f35c08a7aa @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - bd44f59e21537ce560d6924805a222f13c009bcb + bfe60d94a7e490e7167cfe1cd17a57c46bbd38ee https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index eb9d33305f5..2401459bf9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.3 + 4.8.0-preview8.19377.4 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28376-29 + 3.0.0-preview8-28377-01 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 11ac798c4deccea50f14e1c7e78e66d4bbe9e790 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 18:56:08 +0000 Subject: [PATCH 199/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.6 (#1417) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.6 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28377-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 175eef9ad4b..9621560bec8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - a84b2df2b968a8420bb3be806e7d13f35c08a7aa + dc10fa11ada6da8c4188fe240360b8841c146d9a @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - bfe60d94a7e490e7167cfe1cd17a57c46bbd38ee + fbfe06aa4a2317ae9f26b6a182abc17174b52819 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2401459bf9a..3b0831dea1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.4 + 4.8.0-preview8.19377.6 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28377-01 + 3.0.0-preview8-28377-07 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From bc1aadd262c5274e5d4f5c58365f7413fa94b72e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2019 20:11:20 +0000 Subject: [PATCH 200/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.7 (#1418) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.7 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28377-08 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9621560bec8..f68410dc5bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - dc10fa11ada6da8c4188fe240360b8841c146d9a + f13518b2544707a0d4a2108314857b8193167abb @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - fbfe06aa4a2317ae9f26b6a182abc17174b52819 + d116b84f691bbdbd299ae132a2d09dd08b09f956 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3b0831dea1f..8db7b0df51b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.6 + 4.8.0-preview8.19377.7 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28377-07 + 3.0.0-preview8-28377-08 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From c8e207e83ee685c3fc1764471327e913863ef647 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 00:31:20 +0000 Subject: [PATCH 201/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.8 (#1419) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.8 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28377-09 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f68410dc5bd..de554cf11a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - f13518b2544707a0d4a2108314857b8193167abb + 55338a5308473de8cc8541a7118d7c2087618e73 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - d116b84f691bbdbd299ae132a2d09dd08b09f956 + f5a95265772a3131d315e850985ea4a07a74830e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 8db7b0df51b..54fa6de15bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.7 + 4.8.0-preview8.19377.8 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28377-08 + 3.0.0-preview8-28377-09 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From dcb1a43a7d91fd1169b1d1f71f61687d7737c1e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 02:51:10 +0000 Subject: [PATCH 202/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.9 (#1420) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.9 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28377-10 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de554cf11a0..157047984b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 55338a5308473de8cc8541a7118d7c2087618e73 + 10395647396f41eddf96701106c9b61d9742c5c6 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - f5a95265772a3131d315e850985ea4a07a74830e + 6d6d1b2881642f9b82b37af1631e7dfabaff6fcd https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 54fa6de15bf..1864909639a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.8 + 4.8.0-preview8.19377.9 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28377-09 + 3.0.0-preview8-28377-10 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From b6ce9daeac4044edc25be8400fd6e30da7d9b0cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 06:26:19 +0000 Subject: [PATCH 203/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.10 (#1421) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.10 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28377-13 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 157047984b0..870d8c7a826 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 10395647396f41eddf96701106c9b61d9742c5c6 + 749dc36386a9c258701024c4ea0523a2d9223c2e @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 6d6d1b2881642f9b82b37af1631e7dfabaff6fcd + 4983d2cb76e26c444e2cb22326b338c87e3e42b0 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 1864909639a..123ef87c3fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.9 + 4.8.0-preview8.19377.10 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28377-10 + 3.0.0-preview8-28377-13 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 0e7715717c4aa41c7d11cb241e3affd1fb31b93a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 08:11:16 +0000 Subject: [PATCH 204/227] Update dependencies from https://github.com/dotnet/winforms build 20190727.11 (#1422) - Microsoft.Private.Winforms - 4.8.0-preview8.19377.11 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28377-14 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 870d8c7a826..13b9fc5510b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 749dc36386a9c258701024c4ea0523a2d9223c2e + 27af73d2d4f8830b37a27b48a4d2945aa4e3de58 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 4983d2cb76e26c444e2cb22326b338c87e3e42b0 + 7c6e79546379f8093202d60696dde2f0b3593757 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 123ef87c3fb..d5068f16756 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.10 + 4.8.0-preview8.19377.11 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28377-13 + 3.0.0-preview8-28377-14 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 3006a77a34c0a3a1a5581bd6d07cf5243ff5de71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 12:42:53 +0000 Subject: [PATCH 205/227] Update dependencies from https://github.com/dotnet/arcade build 20190727.2 (#1425) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19377.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19377.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19377.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19377.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19377.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13b9fc5510b..74a340a702b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 7c6e79546379f8093202d60696dde2f0b3593757 - + https://github.com/dotnet/arcade - 316481e57ee5e6acbbf2401eb6778a1d3d48d25b + 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 - + https://github.com/dotnet/arcade - 316481e57ee5e6acbbf2401eb6778a1d3d48d25b + 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr c01a9a157d512343ef104bb2b1f97b356e708b11 - + https://github.com/dotnet/arcade - 316481e57ee5e6acbbf2401eb6778a1d3d48d25b + 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 - + https://github.com/dotnet/arcade - 316481e57ee5e6acbbf2401eb6778a1d3d48d25b + 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 - + https://github.com/dotnet/arcade - 316481e57ee5e6acbbf2401eb6778a1d3d48d25b + 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 diff --git a/eng/Versions.props b/eng/Versions.props index d5068f16756..53d88934377 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19376.18 - 1.0.0-beta.19376.18 - 1.0.0-beta.19376.18 + 1.0.0-beta.19377.2 + 1.0.0-beta.19377.2 + 1.0.0-beta.19377.2 diff --git a/global.json b/global.json index fdf89b904b8..156bbe557bd 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19376.18", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19376.18" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19377.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19377.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 8554c5a4d1d2c5dbf32c5de970c6a377865d5319 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 13:16:13 +0000 Subject: [PATCH 206/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.1 (#1426) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.1 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-01 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74a340a702b..b693625f0c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 27af73d2d4f8830b37a27b48a4d2945aa4e3de58 + 38b423c42682b9a24119a9c25b9a16ca0255d896 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 7c6e79546379f8093202d60696dde2f0b3593757 + 65ab0315fd8ad9a3c25493b3d3b234585a643ae0 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 53d88934377..2eb12b088c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19377.11 + 4.8.0-preview8.19378.1 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28377-14 + 3.0.0-preview8-28378-01 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 7b28ced98e1830b6417ebda79cf803abd6688872 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 13:20:20 +0000 Subject: [PATCH 207/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190728.6 (#1427) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19378.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b693625f0c1..adec978e999 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - c012221298afc68c7ef75c11e3167a263a665bf8 + 43eca5268b55c405690ebb901d2dbcd8dc8b4a93 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 2eb12b088c6..0a3bf96f934 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,6 +112,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19377.2 + 4.8.0-preview8.19378.6 From 98ff4460a140d873469e06d814d5186235b48c43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 13:42:18 +0000 Subject: [PATCH 208/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.2 (#1428) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adec978e999..e54dcad6d21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 38b423c42682b9a24119a9c25b9a16ca0255d896 + bf105cb56d088e02d36072624b65dfbe6f1549ef diff --git a/eng/Versions.props b/eng/Versions.props index 0a3bf96f934..d0ee3389ddb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.1 + 4.8.0-preview8.19378.2 From 89c5a24c4b58cf3484e712b110219c8c109dc432 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 15:21:39 +0000 Subject: [PATCH 209/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.3 (#1429) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.3 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-02 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e54dcad6d21..c0ddd822251 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - bf105cb56d088e02d36072624b65dfbe6f1549ef + 9db4f28440c182fd4c6fc1c45946d2be7938683e @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 65ab0315fd8ad9a3c25493b3d3b234585a643ae0 + 2440e10f6ae4782e51a4c30c4fa49436cbe0f01d https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index d0ee3389ddb..d89b7e5e54e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.2 + 4.8.0-preview8.19378.3 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-01 + 3.0.0-preview8-28378-02 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 0748778fc838eff8fc30913eeb5ff4f26611419b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 17:55:03 +0000 Subject: [PATCH 210/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.4 (#1430) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.4 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-05 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0ddd822251..5d774274717 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 9db4f28440c182fd4c6fc1c45946d2be7938683e + 1f9e923e321f57fa64d8b57ec18401cd79fb8855 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 2440e10f6ae4782e51a4c30c4fa49436cbe0f01d + 225a583cd08da34fb9aeefd306d9c1cab4847f59 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index d89b7e5e54e..6c2dc2ec81d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.3 + 4.8.0-preview8.19378.4 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-02 + 3.0.0-preview8-28378-05 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 7682e2328d219f228efe954c019b03707e172c64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 18:46:28 +0000 Subject: [PATCH 211/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.5 (#1431) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.5 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-07 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d774274717..f77087b294c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 1f9e923e321f57fa64d8b57ec18401cd79fb8855 + 6442e642601a0d8f732819fbb6d59adcdbad9ff0 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 225a583cd08da34fb9aeefd306d9c1cab4847f59 + 425e92dd3b6c58be2a897d885a57fb1026bd2ea2 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 6c2dc2ec81d..ecde5180986 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.4 + 4.8.0-preview8.19378.5 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-05 + 3.0.0-preview8-28378-07 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From b81e474acee8203bbbacced731e819cdea4a5a59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 20:26:09 +0000 Subject: [PATCH 212/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.6 (#1432) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.6 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-08 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f77087b294c..46b5c18df9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 6442e642601a0d8f732819fbb6d59adcdbad9ff0 + df4a97bcbcbe6070b60b7880a2819f1345425aab @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 425e92dd3b6c58be2a897d885a57fb1026bd2ea2 + 823e54187b997cb8303f44cd8a6d4fc1adefee47 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index ecde5180986..e7e3f2d96bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.5 + 4.8.0-preview8.19378.6 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-07 + 3.0.0-preview8-28378-08 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 08f1d90a9c17aa62f24060caf1e232cfd0724e5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 21:26:08 +0000 Subject: [PATCH 213/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.7 (#1433) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.7 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-09 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46b5c18df9c..f0427764195 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - df4a97bcbcbe6070b60b7880a2819f1345425aab + 1f96cc82dccc1cdf5b282b019956fff9573afc8a @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 823e54187b997cb8303f44cd8a6d4fc1adefee47 + c040f6deaa57c86e247a7a0f2d5487351a3e279e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e7e3f2d96bf..ed8e00213af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.6 + 4.8.0-preview8.19378.7 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-08 + 3.0.0-preview8-28378-09 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 71de3c6ec4086eab629011557972cb60c744591b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2019 23:56:19 +0000 Subject: [PATCH 214/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.8 (#1434) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.8 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-10 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0427764195..e3825326840 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 1f96cc82dccc1cdf5b282b019956fff9573afc8a + c7d74852cf36bde3a4af555b00826ca70136636e @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - c040f6deaa57c86e247a7a0f2d5487351a3e279e + 66bb41278c93c7f9e34499dc9fcaa973987e96dc https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index ed8e00213af..0ea57b63ee8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.7 + 4.8.0-preview8.19378.8 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-09 + 3.0.0-preview8-28378-10 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From ac3900dfcd6f8cb1e3ad4e659955d66a7f85de31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 00:41:12 +0000 Subject: [PATCH 215/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.9 (#1435) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.9 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-11 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3825326840..0799bd1f05a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - c7d74852cf36bde3a4af555b00826ca70136636e + 855a821d2d6f11bd692b53ac179bf62c0d186f75 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 66bb41278c93c7f9e34499dc9fcaa973987e96dc + b48c810028097d09c97ccb8553c2c13c84b66477 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 0ea57b63ee8..26353464df7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.8 + 4.8.0-preview8.19378.9 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-10 + 3.0.0-preview8-28378-11 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 330b2dfb91ae6df6a2f39289b1e6a48a873a161f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 05:01:14 +0000 Subject: [PATCH 216/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.10 (#1437) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.10 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-13 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0799bd1f05a..db22ceefaa3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 855a821d2d6f11bd692b53ac179bf62c0d186f75 + 1221881bf0792e711458a3c26e0cd21013140342 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - b48c810028097d09c97ccb8553c2c13c84b66477 + 1a158ddecbbe7a060e8674a931abee92e70fb036 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 26353464df7..e922fc02c9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.9 + 4.8.0-preview8.19378.10 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-11 + 3.0.0-preview8-28378-13 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 73748bff4a485121754109d9abe1ef1e725b82e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 06:46:24 +0000 Subject: [PATCH 217/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.11 (#1438) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.11 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28378-16 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db22ceefaa3..96d75cb7ca5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 1221881bf0792e711458a3c26e0cd21013140342 + 6f69e1c0bfa132a3eccd854982b591213ea86044 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 1a158ddecbbe7a060e8674a931abee92e70fb036 + 44512181385551ade3b82730eb28dceb4bd57662 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e922fc02c9f..67660df2723 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.10 + 4.8.0-preview8.19378.11 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-13 + 3.0.0-preview8-28378-16 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 1b445b650a093d1c62848f5444d81da244d0ecd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 08:31:14 +0000 Subject: [PATCH 218/227] Update dependencies from https://github.com/dotnet/winforms build 20190728.12 (#1439) - Microsoft.Private.Winforms - 4.8.0-preview8.19378.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96d75cb7ca5..698ac1551b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 6f69e1c0bfa132a3eccd854982b591213ea86044 + 46899a809e625427ff3e89e5575239bbc56493f6 diff --git a/eng/Versions.props b/eng/Versions.props index 67660df2723..3da1a8926b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.11 + 4.8.0-preview8.19378.12 From b478fe6505e8f1952178425d0dd9cda51c5a800a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 09:41:08 +0000 Subject: [PATCH 219/227] Update dependencies from https://github.com/dotnet/winforms build 20190729.1 (#1440) - Microsoft.Private.Winforms - 4.8.0-preview8.19379.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 698ac1551b7..dc76bdfcb39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 46899a809e625427ff3e89e5575239bbc56493f6 + d2ebed14f4cb85eea84efc3b732770fa11dcc082 diff --git a/eng/Versions.props b/eng/Versions.props index 3da1a8926b5..55c0b2f5ab2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19378.12 + 4.8.0-preview8.19379.1 From 2fa0411850161fe85ecc87a1a1249fd702fa3f40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 11:16:26 +0000 Subject: [PATCH 220/227] Update dependencies from https://github.com/dotnet/winforms build 20190729.2 (#1441) - Microsoft.Private.Winforms - 4.8.0-preview8.19379.2 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28379-01 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc76bdfcb39..6ba29e24e80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - d2ebed14f4cb85eea84efc3b732770fa11dcc082 + 803d8c927ec90a32c2c5adc32e23171b422b1bc7 @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 91424da223c9027e7e875f1ef5d73c3c9ea88bdd - + https://github.com/dotnet/core-setup - 44512181385551ade3b82730eb28dceb4bd57662 + 6a62209e78a23fe4e6af59b14f2f74edacb2be3f https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 55c0b2f5ab2..c8035ed4b46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19379.1 + 4.8.0-preview8.19379.2 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28378-16 + 3.0.0-preview8-28379-01 3.0.0-preview8.19376.12 4.6.0-preview8.19376.12 4.6.0-preview8.19376.12 From 0274777d807ce1e9f8d40a09ac2a768ae74f74d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 12:28:16 +0000 Subject: [PATCH 221/227] Update dependencies from https://github.com/dotnet/arcade build 20190728.1 (#1444) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19378.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19378.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19378.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19378.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19378.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ba29e24e80..4c823a9dc54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/dotnet/core-setup 6a62209e78a23fe4e6af59b14f2f74edacb2be3f - + https://github.com/dotnet/arcade - 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 + a8e982d3bac01d8f4f91a4c57191147570079448 - + https://github.com/dotnet/arcade - 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 + a8e982d3bac01d8f4f91a4c57191147570079448 https://github.com/dotnet/corefx @@ -95,17 +95,17 @@ https://github.com/dotnet/coreclr c01a9a157d512343ef104bb2b1f97b356e708b11 - + https://github.com/dotnet/arcade - 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 + a8e982d3bac01d8f4f91a4c57191147570079448 - + https://github.com/dotnet/arcade - 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 + a8e982d3bac01d8f4f91a4c57191147570079448 - + https://github.com/dotnet/arcade - 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 + a8e982d3bac01d8f4f91a4c57191147570079448 diff --git a/eng/Versions.props b/eng/Versions.props index c8035ed4b46..cd43e69acf3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ - 1.0.0-beta.19377.2 - 1.0.0-beta.19377.2 - 1.0.0-beta.19377.2 + 1.0.0-beta.19378.1 + 1.0.0-beta.19378.1 + 1.0.0-beta.19378.1 diff --git a/global.json b/global.json index 156bbe557bd..6ff6583ece5 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19377.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19377.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19378.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19378.1" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 684c4beb7d7aa87f614decc86ce380688441e722 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 12:31:22 +0000 Subject: [PATCH 222/227] Update dependencies from https://github.com/dotnet/winforms build 20190729.3 (#1443) - Microsoft.Private.Winforms - 4.8.0-preview8.19379.3 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview8-28379-02 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19378.8 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview8.19378.8 (parent: Microsoft.NETCore.App) --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++----------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c823a9dc54..35e7d886dab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - 803d8c927ec90a32c2c5adc32e23171b422b1bc7 + 733fc9332d863d4d705af2dd9d08ada7bbfa85f6 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/core-setup - 6a62209e78a23fe4e6af59b14f2f74edacb2be3f + 3a87ac0079c714f13e35b319ad68cd15f66e0172 https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade a8e982d3bac01d8f4f91a4c57191147570079448 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 43eca5268b55c405690ebb901d2dbcd8dc8b4a93 - + https://github.com/dotnet/corefx - 91424da223c9027e7e875f1ef5d73c3c9ea88bdd + 80f411d58df8338ccd9430900b541a037a9cb383 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index cd43e69acf3..9d16769cd47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,11 +4,11 @@ 4.8.0 preview8 4.0.0.0 - 4.6.0-preview8.19376.12 + 4.6.0-preview8.19378.8 - 4.8.0-preview8.19379.2 + 4.8.0-preview8.19379.3 @@ -18,25 +18,25 @@ - 3.0.0-preview8-28379-01 - 3.0.0-preview8.19376.12 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 + 3.0.0-preview8-28379-02 + 3.0.0-preview8.19378.8 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 4.6.0-preview4.19176.11 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 - 4.6.0-preview8.19376.12 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 + 4.6.0-preview8.19378.8 From 7c1d104ba917a50d2b32c53a5ed39d1621a0e9ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 13:11:04 +0000 Subject: [PATCH 223/227] Update dependencies from https://github.com/dotnet/winforms build 20190729.4 (#1445) - Microsoft.Private.Winforms - 4.8.0-preview8.19379.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35e7d886dab..338133116ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - 733fc9332d863d4d705af2dd9d08ada7bbfa85f6 + f9bfbdff8d0e159a2e01af3a3b653134ebd73dfd diff --git a/eng/Versions.props b/eng/Versions.props index 9d16769cd47..6be945be9e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19379.3 + 4.8.0-preview8.19379.4 From 4d30758ddeec7211d1658e2eb0334e6bde0b00dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 13:15:38 +0000 Subject: [PATCH 224/227] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190729.4 (#1446) - Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview8.19379.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 338133116ad..abf6a224d63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/corefx 80f411d58df8338ccd9430900b541a037a9cb383 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 43eca5268b55c405690ebb901d2dbcd8dc8b4a93 + 8248026ca9df8ba891de6de97b91779ecaa35983 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 6be945be9e9..97cd6c0b914 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,6 +112,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 4.8.0-preview8.19378.6 + 4.8.0-preview8.19379.4 From 5d7c14a80ecc13577bdba310b1c0064f6a68151a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 14:27:02 +0000 Subject: [PATCH 225/227] Update dependencies from https://github.com/dotnet/winforms build 20190729.5 (#1447) - Microsoft.Private.Winforms - 4.8.0-preview8.19379.5 Dependency coherency updates - Microsoft.NETCore.App - 3.0.0-preview8-28379-03 (parent: Microsoft.Private.Winforms) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abf6a224d63..0d52a5b69d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - f9bfbdff8d0e159a2e01af3a3b653134ebd73dfd + a2ebccce01ca8007806196f1cc5ea1870e3817fa @@ -59,9 +59,9 @@ https://github.com/dotnet/corefx 80f411d58df8338ccd9430900b541a037a9cb383 - + https://github.com/dotnet/core-setup - 3a87ac0079c714f13e35b319ad68cd15f66e0172 + 915722554dc08a7075f89eddb40691caca23b6be https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 97cd6c0b914..743c2bcdd7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19379.4 + 4.8.0-preview8.19379.5 @@ -18,7 +18,7 @@ - 3.0.0-preview8-28379-02 + 3.0.0-preview8-28379-03 3.0.0-preview8.19378.8 4.6.0-preview8.19378.8 4.6.0-preview8.19378.8 From e2cae5febeba467585d913a632a740164612bf23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 16:00:11 +0000 Subject: [PATCH 226/227] Update dependencies from https://github.com/dotnet/winforms build 20190729.6 (#1448) - Microsoft.Private.Winforms - 4.8.0-preview8.19379.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d52a5b69d1..9d728e06d4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - a2ebccce01ca8007806196f1cc5ea1870e3817fa + c9282841007d05b4eca42bbcb5782d5341571b86 diff --git a/eng/Versions.props b/eng/Versions.props index 743c2bcdd7b..b5f6c446f21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19379.5 + 4.8.0-preview8.19379.6 From a706c2f4bf35df145343d3ac348b64ed92e9e504 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2019 16:18:10 +0000 Subject: [PATCH 227/227] [master] Update dependencies from dotnet/winforms (#1449) * Update dependencies from https://github.com/dotnet/winforms build 20190729.7 - Microsoft.Private.Winforms - 4.8.0-preview8.19379.7 * Update dependencies from https://github.com/dotnet/winforms build 20190729.8 - Microsoft.Private.Winforms - 4.8.0-preview8.19379.8 * Update dependencies from https://github.com/dotnet/winforms build 20190729.9 - Microsoft.Private.Winforms - 4.8.0-preview8.19379.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d728e06d4a..9045527ef65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/winforms - c9282841007d05b4eca42bbcb5782d5341571b86 + b0e49f17123cda852fecfc4610036f31de0d3b94 diff --git a/eng/Versions.props b/eng/Versions.props index b5f6c446f21..4fe293f86e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ - 4.8.0-preview8.19379.6 + 4.8.0-preview8.19379.9