Skip to content

Commit 1824d05

Browse files
Update dependencies from https://github.com/dotnet/dotnet build 268384
Updated Dependencies: Microsoft.Private.Winforms, Microsoft.Dotnet.WinForms.ProjectTemplates, System.Reflection.MetadataLoadContext, System.Windows.Extensions, Microsoft.NETCore.Platforms, System.Resources.Extensions, System.Runtime.Serialization.Formatters, Microsoft.NETCore.App.Ref, Microsoft.NETCore.App.Runtime.win-x64, VS.Redist.Common.NetCore.SharedFramework.x64.10.0, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Formats.Nrbf, System.IO.Packaging, System.Security.Cryptography.Xml, System.Security.Permissions, System.Drawing.Common (Version 10.0.0-preview.5.25260.104 -> 10.0.0-preview.5.25263.104) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.GenAPI, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.GitHub (Version 10.0.0-beta.25260.104 -> 10.0.0-beta.25263.104)
1 parent fc65d5f commit 1824d05

File tree

5 files changed

+78
-80
lines changed

5 files changed

+78
-80
lines changed

eng/Version.Details.xml

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="362a4227bd38985f75f6a6d7f6733c7d62414569" BarId="268099" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="ad8565092bbfdd5c8b4a94a718d10b2d394f7aee" BarId="268384" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.5.25263.108">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.5.25265.101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
7+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.5.25263.108">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.5.25265.101">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
11+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25263.108">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25265.101">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
15+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25263.108">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25265.101">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
19+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25263.108">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25265.101">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
23+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.5.25222.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>462eb030906d5cfcbcbbe22126855da1073cda15</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25263.108">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25265.101">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
31+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25263.108">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25265.101">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
35+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25263.108">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25265.101">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
39+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25263.108">
41+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25265.101">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
43+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
4444
</Dependency>
45-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25263.108">
45+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25265.101">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
47+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
4848
</Dependency>
49-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25263.108">
49+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25265.101">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
51+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25263.108">
53+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25265.101">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
55+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.5.25263.108">
57+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.5.25265.101">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
59+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
6060
</Dependency>
61-
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.5.25263.108">
61+
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.5.25265.101">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
63+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25263.108">
65+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25265.101">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
67+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
6868
</Dependency>
69-
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.5.25263.108">
69+
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.5.25265.101">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
71+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.5.25263.108">
73+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.5.25265.101">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
75+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
7676
</Dependency>
77-
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.5.25263.108">
77+
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.5.25265.101">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
79-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
79+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
8080
</Dependency>
81-
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.5.25263.108">
81+
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.5.25265.101">
8282
<Uri>https://github.com/dotnet/dotnet</Uri>
83-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
83+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25263.108">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25265.101">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
89+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25263.108">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25265.101">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
93+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25263.108">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25265.101">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
97+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25263.108">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25265.101">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
101+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25263.108">
103+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25265.101">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
105+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25263.108">
107+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25265.101">
108108
<Uri>https://github.com/dotnet/dotnet</Uri>
109-
<Sha>362a4227bd38985f75f6a6d7f6733c7d62414569</Sha>
109+
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
110110
</Dependency>
111111
</ToolsetDependencies>
112112
</Dependencies>

eng/Versions.props

+23-23
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,35 @@
1919
dotnet/winforms is handling versions for the analyzers.
2020
-->
2121
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
22-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25263.108</MicrosoftDotNetCodeAnalysisVersion>
23-
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25263.108</MicrosoftSourceLinkAzureReposGitVersion>
24-
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25263.108</MicrosoftSourceLinkGitHubVersion>
22+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25265.101</MicrosoftDotNetCodeAnalysisVersion>
23+
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25265.101</MicrosoftSourceLinkAzureReposGitVersion>
24+
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25265.101</MicrosoftSourceLinkGitHubVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/winforms -->
2727
<PropertyGroup>
28-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.5.25263.108</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29-
<MicrosoftPrivateWinformsVersion>10.0.0-preview.5.25263.108</MicrosoftPrivateWinformsVersion>
30-
<SystemDrawingCommonVersion>10.0.0-preview.5.25263.108</SystemDrawingCommonVersion>
28+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.5.25265.101</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.5.25265.101</MicrosoftPrivateWinformsVersion>
30+
<SystemDrawingCommonVersion>10.0.0-preview.5.25265.101</SystemDrawingCommonVersion>
3131
</PropertyGroup>
3232
<!-- Packages that come from https://github.com/dotnet/runtime -->
3333
<PropertyGroup>
34-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25263.108</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
35-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25263.108</MicrosoftNETCoreAppRefVersion>
36-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25263.108</MicrosoftNETCoreAppRuntimewinx64Version>
37-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.5.25263.108</MicrosoftNETCorePlatformsVersion>
38-
<SystemCodeDomPackageVersion>10.0.0-preview.5.25263.108</SystemCodeDomPackageVersion>
39-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25263.108</SystemConfigurationConfigurationManagerPackageVersion>
40-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.5.25263.108</SystemDiagnosticsEventLogPackageVersion>
41-
<SystemDirectoryServicesVersion>10.0.0-preview.5.25263.108</SystemDirectoryServicesVersion>
42-
<SystemFormatsNrbfVersion>10.0.0-preview.5.25263.108</SystemFormatsNrbfVersion>
43-
<SystemIOPackagingVersion>10.0.0-preview.5.25263.108</SystemIOPackagingVersion>
44-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25263.108</SystemReflectionMetadataLoadContextVersion>
34+
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25265.101</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
35+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25265.101</MicrosoftNETCoreAppRefVersion>
36+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25265.101</MicrosoftNETCoreAppRuntimewinx64Version>
37+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.5.25265.101</MicrosoftNETCorePlatformsVersion>
38+
<SystemCodeDomPackageVersion>10.0.0-preview.5.25265.101</SystemCodeDomPackageVersion>
39+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25265.101</SystemConfigurationConfigurationManagerPackageVersion>
40+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.5.25265.101</SystemDiagnosticsEventLogPackageVersion>
41+
<SystemDirectoryServicesVersion>10.0.0-preview.5.25265.101</SystemDirectoryServicesVersion>
42+
<SystemFormatsNrbfVersion>10.0.0-preview.5.25265.101</SystemFormatsNrbfVersion>
43+
<SystemIOPackagingVersion>10.0.0-preview.5.25265.101</SystemIOPackagingVersion>
44+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25265.101</SystemReflectionMetadataLoadContextVersion>
4545
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
46-
<SystemResourcesExtensionsVersion>10.0.0-preview.5.25263.108</SystemResourcesExtensionsVersion>
47-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25263.108</SystemRuntimeSerializationFormattersPackageVersion>
48-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.5.25263.108</SystemSecurityCryptographyXmlPackageVersion>
49-
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25263.108</SystemSecurityPermissionsPackageVersion>
50-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25263.108</SystemWindowsExtensionsPackageVersion>
46+
<SystemResourcesExtensionsVersion>10.0.0-preview.5.25265.101</SystemResourcesExtensionsVersion>
47+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25265.101</SystemRuntimeSerializationFormattersPackageVersion>
48+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.5.25265.101</SystemSecurityCryptographyXmlPackageVersion>
49+
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25265.101</SystemSecurityPermissionsPackageVersion>
50+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25265.101</SystemWindowsExtensionsPackageVersion>
5151
</PropertyGroup>
5252
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
5353
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
@@ -61,7 +61,7 @@
6161
<!-- Packages that come from https://github.com/dotnet/arcade -->
6262
<PropertyGroup>
6363
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
64-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25263.108</MicrosoftDotNetGenAPIVersion>
64+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25265.101</MicrosoftDotNetGenAPIVersion>
6565
</PropertyGroup>
6666
<!-- Sourcelink -->
6767
<PropertyGroup>

eng/common/tools.ps1

+1-3
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
6868
# True if the build is a product build
6969
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
7070

71-
[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
72-
7371
function Create-Directory ([string[]] $path) {
7472
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
7573
}
@@ -853,7 +851,7 @@ function MSBuild-Core() {
853851

854852
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
855853
# Skip this when the build is a child of the VMR orchestrator build.
856-
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
854+
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) {
857855
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
858856
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
859857
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

eng/common/tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function MSBuild-Core {
507507

508508
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
509509
# Skip this when the build is a child of the VMR orchestrator build.
510-
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
510+
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then
511511
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
512512
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
513513
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.108",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101",
1919
"Microsoft.Build.NoTargets": "3.7.56"
2020
},
2121
"sdk": {

0 commit comments

Comments
 (0)