From 2a68363b2d3fb78d6aa8f5027e671421636a79f9 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Thu, 6 Feb 2020 16:09:40 -0800 Subject: [PATCH 1/3] Add triggers for experimental/* --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 74f69b3f9..e152e2137 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,9 +3,11 @@ trigger: branches: include: - master + - experimental/* pr: - master +- experimental/* name: $(Date:yyyyMMdd)$(Rev:.r) From 1d64e3910d06a00a3e415acf133c3c2b78b2785c Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Thu, 6 Feb 2020 12:37:47 -0800 Subject: [PATCH 2/3] Remove [dotnet-wpf-int]Microsoft.DotNet.Wpf.DncEng dependency and redirect it to [dotnet/wpf]Microsoft.DotNet.Wpf.GitHub --- eng/Version.Details.xml | 10 +++------- eng/Versions.props | 4 +--- pkg/windowsdesktop/src/windowsdesktop.depproj | 1 - 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcc4a6b37..12b8ccacb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -117,18 +117,14 @@ https://github.com/dotnet/coreclr a9f3fc16483eecfc47fb79c362811d870be02249 - + https://github.com/dotnet/winforms 8818624e86a7aa64dbcd06fe78e406fa8caf008a - - https://github.com/dotnet/wpf + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 4032e7e163d8d1b3b3f446688d2d11edd864c33f - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 3820ef430e9ced4cd027786b073271770946254c - https://github.com/dotnet/core-setup 4ace84dbf94128b4825c76cdd09b46dba7473478 diff --git a/eng/Versions.props b/eng/Versions.props index 823345a72..f32784cfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,9 +84,7 @@ 5.0.0-preview.1.20110.4 - 5.0.0-preview.1.20110.16 - - 5.0.0-preview.1.20111.7 + 5.0.0-preview.1.20108.13 15.7.179 $(MicrosoftBuildVersion) diff --git a/pkg/windowsdesktop/src/windowsdesktop.depproj b/pkg/windowsdesktop/src/windowsdesktop.depproj index 231bdb032..2553a4d58 100644 --- a/pkg/windowsdesktop/src/windowsdesktop.depproj +++ b/pkg/windowsdesktop/src/windowsdesktop.depproj @@ -1,7 +1,6 @@ - From e7c8cb779494b21cf3a38f0c616808269633a564 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Tue, 11 Feb 2020 17:35:56 -0800 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/wpf (https://dev.azure.com/dnceng/internal/_git/dotnet-wpf) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12b8ccacb..b86cf51e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://github.com/dotnet/winforms 8818624e86a7aa64dbcd06fe78e406fa8caf008a - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4032e7e163d8d1b3b3f446688d2d11edd864c33f + + https://github.com/dotnet/wpf + 50d2d8b79705def3c236021e93c510ad00d5a900 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index f32784cfc..5c94f5cb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,7 +84,7 @@ 5.0.0-preview.1.20110.4 - 5.0.0-preview.1.20108.13 + 5.0.0-preview.1.20111.9 15.7.179 $(MicrosoftBuildVersion)