From 0a8a63da0fe1cbcb335a075a7481caf277273752 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Feb 2019 13:07:13 +0000 Subject: [PATCH 01/16] Update dependencies from https://github.com/dotnet/arcade build 20190207.1 (#332) This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19107.1 --- eng/Version.Details.xml | 4 ++-- .../templates/phases/publish-build-assets.yml | 13 ++++++++----- global.json | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 535cba0195d..401c17218c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/arcade - b58add62b88ab28edd15932fb19f00b9e1c5e8dd + 03c88c88a653dd8122cf599974e6073f27787a3f diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml index 85fabe62b98..211967debab 100644 --- a/eng/common/templates/phases/publish-build-assets.yml +++ b/eng/common/templates/phases/publish-build-assets.yml @@ -28,12 +28,15 @@ phases: SecretsFilter: 'MaestroAccessToken' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - script: eng\common\publishbuildassets.cmd - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:Configuration=$(_BuildConfig) + - 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:Configuration=$(_BuildConfig) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - task: PublishBuildArtifacts@1 diff --git a/global.json b/global.json index 787b5272458..0bc23089372 100644 --- a/global.json +++ b/global.json @@ -9,6 +9,6 @@ "version": "3.0.100-preview-010024" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19106.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19107.1" } } From 6d8189a656affd842af154825d5989e933244ed1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Feb 2019 13:14:44 +0000 Subject: [PATCH 02/16] Update dependencies from https://github.com/dotnet/corefx build 20190207.12 (#333) This change updates the following dependencies - System.CodeDom - 4.6.0-preview.19107.12 - Microsoft.Win32.Registry - 4.6.0-preview.19107.12 - System.Windows.Extensions - 4.6.0-preview.19107.12 - System.Configuration.ConfigurationManager - 4.6.0-preview.19107.12 - System.Reflection.TypeExtensions - 4.6.0-preview.19107.12 - System.Security.AccessControl - 4.6.0-preview.19107.12 - System.Security.Cryptography.Xml - 4.6.0-preview.19107.12 - System.Security.Permissions - 4.6.0-preview.19107.12 - System.Security.Principal.Windows - 4.6.0-preview.19107.12 - System.Reflection.Emit - 4.6.0-preview.19107.12 - System.Diagnostics.EventLog - 4.6.0-preview.19107.12 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 401c17218c9..a91ab9065b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,49 @@ - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e - + https://github.com/dotnet/corefx - 4d180567e9dc5500006b58480184f0dcfe967c1e + 3685052201c95462f210582be9fe380baf1b902e diff --git a/eng/Versions.props b/eng/Versions.props index 692d427dd09..c12c99d0a93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 - 4.6.0-preview.19106.8 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 + 4.6.0-preview.19107.12 0.1.0-preview2-181205-2 From fea93ceeca485483bc50393aaf3962d21eae41cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Feb 2019 13:07:22 +0000 Subject: [PATCH 03/16] Update dependencies from https://github.com/dotnet/arcade build 20190208.1 (#335) This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19108.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91ab9065b0..e2786ca781b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ - + https://github.com/dotnet/arcade - 03c88c88a653dd8122cf599974e6073f27787a3f + 044309163eadaad0068156f0327af458d562f171 diff --git a/global.json b/global.json index 0bc23089372..b3b864adade 100644 --- a/global.json +++ b/global.json @@ -9,6 +9,6 @@ "version": "3.0.100-preview-010024" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19107.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19108.1" } } From 66efaf190bc951e696fbce64a748e1d52f5d2436 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Feb 2019 13:17:19 +0000 Subject: [PATCH 04/16] Update dependencies from https://github.com/dotnet/corefx build 20190208.8 (#336) This change updates the following dependencies - System.CodeDom - 4.6.0-preview.19108.8 - Microsoft.Win32.Registry - 4.6.0-preview.19108.8 - System.Windows.Extensions - 4.6.0-preview.19108.8 - System.Configuration.ConfigurationManager - 4.6.0-preview.19108.8 - System.Reflection.TypeExtensions - 4.6.0-preview.19108.8 - System.Security.AccessControl - 4.6.0-preview.19108.8 - System.Security.Cryptography.Xml - 4.6.0-preview.19108.8 - System.Security.Permissions - 4.6.0-preview.19108.8 - System.Security.Principal.Windows - 4.6.0-preview.19108.8 - System.Reflection.Emit - 4.6.0-preview.19108.8 - System.Diagnostics.EventLog - 4.6.0-preview.19108.8 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2786ca781b..6d60dbf6a78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,49 @@ - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a - + https://github.com/dotnet/corefx - 3685052201c95462f210582be9fe380baf1b902e + e1c0e1d4928b27113cdb2d021f4abbb202c9892a diff --git a/eng/Versions.props b/eng/Versions.props index c12c99d0a93..4ed6ec38727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 - 4.6.0-preview.19107.12 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 + 4.6.0-preview.19108.8 0.1.0-preview2-181205-2 From 8430bf64934846e11790d73ffd43aba5a2d20fd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Feb 2019 13:14:39 +0000 Subject: [PATCH 05/16] Update dependencies from dotnet/corefx (#337) * Update dependencies from https://github.com/dotnet/corefx build 20190209.6 This change updates the following dependencies - System.CodeDom - 4.6.0-preview.19109.6 - Microsoft.Win32.Registry - 4.6.0-preview.19109.6 - System.Windows.Extensions - 4.6.0-preview.19109.6 - System.Configuration.ConfigurationManager - 4.6.0-preview.19109.6 - System.Reflection.TypeExtensions - 4.6.0-preview.19109.6 - System.Security.AccessControl - 4.6.0-preview.19109.6 - System.Security.Cryptography.Xml - 4.6.0-preview.19109.6 - System.Security.Permissions - 4.6.0-preview.19109.6 - System.Security.Principal.Windows - 4.6.0-preview.19109.6 - System.Reflection.Emit - 4.6.0-preview.19109.6 - System.Diagnostics.EventLog - 4.6.0-preview.19109.6 * Update dependencies from https://github.com/dotnet/corefx build 20190210.4 This change updates the following dependencies - System.CodeDom - 4.6.0-preview.19110.4 - Microsoft.Win32.Registry - 4.6.0-preview.19110.4 - System.Windows.Extensions - 4.6.0-preview.19110.4 - System.Configuration.ConfigurationManager - 4.6.0-preview.19110.4 - System.Reflection.TypeExtensions - 4.6.0-preview.19110.4 - System.Security.AccessControl - 4.6.0-preview.19110.4 - System.Security.Cryptography.Xml - 4.6.0-preview.19110.4 - System.Security.Permissions - 4.6.0-preview.19110.4 - System.Security.Principal.Windows - 4.6.0-preview.19110.4 - System.Reflection.Emit - 4.6.0-preview.19110.4 - System.Diagnostics.EventLog - 4.6.0-preview.19110.4 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d60dbf6a78..3c1732b9e9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,49 @@ - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 - + https://github.com/dotnet/corefx - e1c0e1d4928b27113cdb2d021f4abbb202c9892a + 224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1 diff --git a/eng/Versions.props b/eng/Versions.props index 4ed6ec38727..41a02873512 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 - 4.6.0-preview.19108.8 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 + 4.6.0-preview.19110.4 0.1.0-preview2-181205-2 From 43f5f44720cc17140dcaf080e1d6b46597a87048 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 11 Feb 2019 10:24:58 -0800 Subject: [PATCH 06/16] Updating branding to Preview4 (#338) --- eng/Versions.props | 2 +- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 41a02873512..32dc62e8c26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 4.8.0 - prerelease + preview4 4.0.0.0 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 d8de8227f7a..98e6d0aaa06 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -15,7 +15,7 @@ runtime.win-$(Platform) runtime.win-x86 - $(PackageRuntimeIdentifierPrefix).Microsoft.DotNet.Wpf.Private + $(PackageRuntimeIdentifierPrefix).Microsoft.DotNet.Wpf.Private-$(PreReleaseVersionLabel) Microsoft.DotNet.Wpf From e7bc5d67441ebe8e8dcd5709b8f8df9531f2ed8d Mon Sep 17 00:00:00 2001 From: Steven Kirbach Date: Mon, 11 Feb 2019 10:48:59 -0800 Subject: [PATCH 07/16] adding back platform builds --- eng/pipeline.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 2b45dcb56d8..263268a913c 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -69,14 +69,26 @@ jobs: value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) strategy: matrix: - Build_Debug: + Build_Debug_x86: _BuildConfig: Debug # override some variables for debug _PublishType: none _SignType: test _DotNetPublishToBlobFeed : false - Build_Release: + _Platform: x86 + Build_Release_x86: _BuildConfig: Release + _Platform: x86 + Build_Debug_x64: + _BuildConfig: Debug + # override some variables for debug + _PublishType: none + _SignType: test + _DotNetPublishToBlobFeed : false + _Platform: x64 + Build_Release_x64: + _BuildConfig: Release + _Platform: x64 steps: - checkout: self clean: true From fd2ca8b5c2ea09c554bbf550b627f628ae4084d3 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 11 Feb 2019 10:24:58 -0800 Subject: [PATCH 08/16] Updating branding to Preview4 (#338) --- eng/Versions.props | 2 +- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 692d427dd09..62c2ddf4099 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 4.8.0 - prerelease + preview4 4.0.0.0 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 d8de8227f7a..98e6d0aaa06 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -15,7 +15,7 @@ runtime.win-$(Platform) runtime.win-x86 - $(PackageRuntimeIdentifierPrefix).Microsoft.DotNet.Wpf.Private + $(PackageRuntimeIdentifierPrefix).Microsoft.DotNet.Wpf.Private-$(PreReleaseVersionLabel) Microsoft.DotNet.Wpf From 4941d52a760de431ff07421dba5f95810ae99298 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 11 Feb 2019 10:49:53 -0800 Subject: [PATCH 09/16] Updating branding to preview3 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 62c2ddf4099..ee849979e3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 4.8.0 - preview4 + preview3 4.0.0.0 From 4d9aad440080764c09c91b7729b9b551d8fabb89 Mon Sep 17 00:00:00 2001 From: Steven Kirbach Date: Mon, 11 Feb 2019 11:06:41 -0800 Subject: [PATCH 10/16] passing platform to cibuild.cmd --- eng/pipeline.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 263268a913c..0effa61aa29 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -39,6 +39,8 @@ jobs: value: '' - name: _OfficialBuildIdArgs value: '' + - name: _Platform + value: x86 # Override some values if we're building internally - ${{ if eq(parameters.runAsPublic, 'false') }}: @@ -67,6 +69,8 @@ jobs: /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + - name: _PlatformArgs + value: /p:Platform=$(_Platform) strategy: matrix: Build_Debug_x86: @@ -75,10 +79,8 @@ jobs: _PublishType: none _SignType: test _DotNetPublishToBlobFeed : false - _Platform: x86 Build_Release_x86: _BuildConfig: Release - _Platform: x86 Build_Debug_x64: _BuildConfig: Debug # override some variables for debug @@ -99,4 +101,5 @@ jobs: $(_PublishArgs) $(_SignArgs) $(_OfficialBuildIdArgs) + $(_PlatformArgs) displayName: Windows Build / Publish \ No newline at end of file From bc8ddb23073f8af40991b5c87a846929b742f74a Mon Sep 17 00:00:00 2001 From: Steven Kirbach Date: Mon, 11 Feb 2019 11:08:59 -0800 Subject: [PATCH 11/16] adding _PlatformArgs to the right place --- eng/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 0effa61aa29..1d75c6cf808 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -41,6 +41,8 @@ jobs: value: '' - name: _Platform value: x86 + - name: _PlatformArgs + value: /p:Platform=$(_Platform) # Override some values if we're building internally - ${{ if eq(parameters.runAsPublic, 'false') }}: @@ -69,8 +71,6 @@ jobs: /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - name: _OfficialBuildIdArgs value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - - name: _PlatformArgs - value: /p:Platform=$(_Platform) strategy: matrix: Build_Debug_x86: From 40eb678be5d4b081e6f6315b65e67f5ebef39fef Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 11 Feb 2019 11:26:13 -0800 Subject: [PATCH 12/16] Adding release/3.0 to triggers --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0a6cdbc44d4..a5cdf231ae9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,6 +12,8 @@ variables: # only trigger ci builds for the master branch trigger: - master +- release/3.0 + # To be added in the future when VSTS supports this feature # only trigger pull request builds for the master branch From ce66766ab9ff0dacf70c1d5d4800119fd1a3a8a8 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 11 Feb 2019 11:28:25 -0800 Subject: [PATCH 13/16] Removing master from list of triggers --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a5cdf231ae9..a494e9b0e33 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,6 @@ variables: # only trigger ci builds for the master branch trigger: -- master - release/3.0 From 566b02f692b15f3ce77bf929a16e522ab3043a1a Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 11 Feb 2019 12:52:16 -0800 Subject: [PATCH 14/16] Go back to producing packages sans preview label --- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 98e6d0aaa06..d8de8227f7a 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -15,7 +15,7 @@ runtime.win-$(Platform) runtime.win-x86 - $(PackageRuntimeIdentifierPrefix).Microsoft.DotNet.Wpf.Private-$(PreReleaseVersionLabel) + $(PackageRuntimeIdentifierPrefix).Microsoft.DotNet.Wpf.Private Microsoft.DotNet.Wpf From 300d6fc270e3f6901b1c01694b6354aeb1355368 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 11 Feb 2019 11:59:59 -0800 Subject: [PATCH 15/16] Add release/3.0 to list of triggers Add release/3.0 to triggers #343 --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a494e9b0e33..e31ea30db7f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,9 +11,9 @@ variables: # only trigger ci builds for the master branch trigger: +- master - release/3.0 - # To be added in the future when VSTS supports this feature # only trigger pull request builds for the master branch # pr: @@ -27,4 +27,4 @@ jobs: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) agentPool: dotnet-internal-temp-vs2019 # runAsPublic is used in expressions, which can't read from user-defined variables - runAsPublic: false \ No newline at end of file + runAsPublic: false From 45657a7669f87fc8732ec09490cd20112fe3b046 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 11 Feb 2019 13:25:06 -0800 Subject: [PATCH 16/16] Update comment --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e31ea30db7f..9e1471e4d26 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,7 @@ variables: # clean the local repo on the build agents Build.Repository.Clean: true -# only trigger ci builds for the master branch +# only trigger ci builds for the master and release branches trigger: - master - release/3.0