Skip to content

Commit e72585b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 269352 (#10871)
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.25267.102 -> 10.0.0-preview.5.25270.108) 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.25267.102 -> 10.0.0-beta.25270.108) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 4b7d461 commit e72585b

File tree

9 files changed

+97
-126
lines changed

9 files changed

+97
-126
lines changed

‎eng/Version.Details.xml

Lines changed: 51 additions & 51 deletions
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="a4d6fdc935d5da12efb00a0b3b693ff1439e0b41" BarId="269082" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="445fb3a55b402cbe3a43576105e6fdc6686c8e4c" BarId="269352" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.5.25270.108">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25272.109">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
7+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.5.25270.108">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25272.109">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
11+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25270.108">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25272.109">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
15+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25270.108">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25272.109">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
19+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25270.108">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25272.109">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
23+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</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.25270.108">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25272.109">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
31+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25270.108">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25272.109">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
35+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25270.108">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25272.109">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
39+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25270.108">
41+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.6.25272.109">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
43+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
4444
</Dependency>
45-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25270.108">
45+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.6.25272.109">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
47+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
4848
</Dependency>
49-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25270.108">
49+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25272.109">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
51+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25270.108">
53+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25272.109">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
55+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.5.25270.108">
57+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25272.109">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
59+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
6060
</Dependency>
61-
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.5.25270.108">
61+
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25272.109">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
63+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25270.108">
65+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25272.109">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
67+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
6868
</Dependency>
69-
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.5.25270.108">
69+
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25272.109">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
71+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.5.25270.108">
73+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25272.109">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
75+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
7676
</Dependency>
77-
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.5.25270.108">
77+
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25272.109">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
79-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
79+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
8080
</Dependency>
81-
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.5.25270.108">
81+
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25272.109">
8282
<Uri>https://github.com/dotnet/dotnet</Uri>
83-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
83+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25270.108">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25272.109">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
89+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25270.108">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25272.109">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
93+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25270.108">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25272.109">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
97+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25270.108">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25272.109">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
101+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25270.108">
103+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25272.109">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
105+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25270.108">
107+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25272.109">
108108
<Uri>https://github.com/dotnet/dotnet</Uri>
109-
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
109+
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
110110
</Dependency>
111111
</ToolsetDependencies>
112112
</Dependencies>

‎eng/Versions.props

Lines changed: 23 additions & 23 deletions
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.25270.108</MicrosoftDotNetCodeAnalysisVersion>
23-
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25270.108</MicrosoftSourceLinkAzureReposGitVersion>
24-
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25270.108</MicrosoftSourceLinkGitHubVersion>
22+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25272.109</MicrosoftDotNetCodeAnalysisVersion>
23+
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25272.109</MicrosoftSourceLinkAzureReposGitVersion>
24+
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25272.109</MicrosoftSourceLinkGitHubVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/winforms -->
2727
<PropertyGroup>
28-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.5.25270.108</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29-
<MicrosoftPrivateWinformsVersion>10.0.0-preview.5.25270.108</MicrosoftPrivateWinformsVersion>
30-
<SystemDrawingCommonVersion>10.0.0-preview.5.25270.108</SystemDrawingCommonVersion>
28+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25272.109</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25272.109</MicrosoftPrivateWinformsVersion>
30+
<SystemDrawingCommonVersion>10.0.0-preview.6.25272.109</SystemDrawingCommonVersion>
3131
</PropertyGroup>
3232
<!-- Packages that come from https://github.com/dotnet/runtime -->
3333
<PropertyGroup>
34-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25270.108</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
35-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25270.108</MicrosoftNETCoreAppRefVersion>
36-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25270.108</MicrosoftNETCoreAppRuntimewinx64Version>
37-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.5.25270.108</MicrosoftNETCorePlatformsVersion>
38-
<SystemCodeDomPackageVersion>10.0.0-preview.5.25270.108</SystemCodeDomPackageVersion>
39-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25270.108</SystemConfigurationConfigurationManagerPackageVersion>
40-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.5.25270.108</SystemDiagnosticsEventLogPackageVersion>
41-
<SystemDirectoryServicesVersion>10.0.0-preview.5.25270.108</SystemDirectoryServicesVersion>
42-
<SystemFormatsNrbfVersion>10.0.0-preview.5.25270.108</SystemFormatsNrbfVersion>
43-
<SystemIOPackagingVersion>10.0.0-preview.5.25270.108</SystemIOPackagingVersion>
44-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25270.108</SystemReflectionMetadataLoadContextVersion>
34+
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.6.25272.109</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
35+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25272.109</MicrosoftNETCoreAppRefVersion>
36+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.6.25272.109</MicrosoftNETCoreAppRuntimewinx64Version>
37+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25272.109</MicrosoftNETCorePlatformsVersion>
38+
<SystemCodeDomPackageVersion>10.0.0-preview.6.25272.109</SystemCodeDomPackageVersion>
39+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25272.109</SystemConfigurationConfigurationManagerPackageVersion>
40+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25272.109</SystemDiagnosticsEventLogPackageVersion>
41+
<SystemDirectoryServicesVersion>10.0.0-preview.6.25272.109</SystemDirectoryServicesVersion>
42+
<SystemFormatsNrbfVersion>10.0.0-preview.6.25272.109</SystemFormatsNrbfVersion>
43+
<SystemIOPackagingVersion>10.0.0-preview.6.25272.109</SystemIOPackagingVersion>
44+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25272.109</SystemReflectionMetadataLoadContextVersion>
4545
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
46-
<SystemResourcesExtensionsVersion>10.0.0-preview.5.25270.108</SystemResourcesExtensionsVersion>
47-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25270.108</SystemRuntimeSerializationFormattersPackageVersion>
48-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.5.25270.108</SystemSecurityCryptographyXmlPackageVersion>
49-
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25270.108</SystemSecurityPermissionsPackageVersion>
50-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25270.108</SystemWindowsExtensionsPackageVersion>
46+
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25272.109</SystemResourcesExtensionsVersion>
47+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25272.109</SystemRuntimeSerializationFormattersPackageVersion>
48+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25272.109</SystemSecurityCryptographyXmlPackageVersion>
49+
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25272.109</SystemSecurityPermissionsPackageVersion>
50+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25272.109</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.25270.108</MicrosoftDotNetGenAPIVersion>
64+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25272.109</MicrosoftDotNetGenAPIVersion>
6565
</PropertyGroup>
6666
<!-- Sourcelink -->
6767
<PropertyGroup>

‎eng/common/build.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Param(
2121
[switch] $publish,
2222
[switch] $clean,
2323
[switch][Alias('pb')]$productBuild,
24+
[switch]$fromVMR,
2425
[switch][Alias('bl')]$binaryLog,
2526
[switch][Alias('nobl')]$excludeCIBinarylog,
2627
[switch] $ci,
@@ -74,6 +75,7 @@ function Print-Usage() {
7475
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7576
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
7677
Write-Host " -buildCheck Sets /check msbuild parameter"
78+
Write-Host " -fromVMR Set when building from within the VMR"
7779
Write-Host ""
7880

7981
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -128,6 +130,7 @@ function Build {
128130
/p:Test=$test `
129131
/p:Pack=$pack `
130132
/p:DotNetBuild=$productBuild `
133+
/p:DotNetBuildFromVMR=$fromVMR `
131134
/p:IntegrationTest=$integrationTest `
132135
/p:PerformanceTest=$performanceTest `
133136
/p:Sign=$sign `

‎eng/common/build.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ usage()
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
4545
echo " --buildCheck <value> Sets /check msbuild parameter"
46+
echo " --fromVMR Set when building from within the VMR"
4647
echo ""
4748
echo "Command line arguments not listed above are passed thru to msbuild."
4849
echo "Arguments can also be passed in with a single hyphen."
@@ -64,6 +65,7 @@ restore=false
6465
build=false
6566
source_build=false
6667
product_build=false
68+
from_vmr=false
6769
rebuild=false
6870
test=false
6971
integration_test=false
@@ -89,7 +91,7 @@ verbosity='minimal'
8991
runtime_source_feed=''
9092
runtime_source_feed_key=''
9193

92-
properties=''
94+
properties=()
9395
while [[ $# > 0 ]]; do
9496
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9597
case "$opt" in
@@ -142,6 +144,9 @@ while [[ $# > 0 ]]; do
142144
restore=true
143145
pack=true
144146
;;
147+
-fromvmr|-from-vmr)
148+
from_vmr=true
149+
;;
145150
-test|-t)
146151
test=true
147152
;;
@@ -187,7 +192,7 @@ while [[ $# > 0 ]]; do
187192
shift
188193
;;
189194
*)
190-
properties="$properties $1"
195+
properties+=("$1")
191196
;;
192197
esac
193198

@@ -221,7 +226,7 @@ function Build {
221226
InitializeCustomToolset
222227

223228
if [[ ! -z "$projects" ]]; then
224-
properties="$properties /p:Projects=$projects"
229+
properties+=("/p:Projects=$projects")
225230
fi
226231

227232
local bl=""
@@ -243,6 +248,7 @@ function Build {
243248
/p:Build=$build \
244249
/p:DotNetBuild=$product_build \
245250
/p:DotNetBuildSourceOnly=$source_build \
251+
/p:DotNetBuildFromVMR=$from_vmr \
246252
/p:Rebuild=$rebuild \
247253
/p:Test=$test \
248254
/p:Pack=$pack \
@@ -251,7 +257,7 @@ function Build {
251257
/p:Sign=$sign \
252258
/p:Publish=$publish \
253259
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
254-
$properties
260+
"${properties[@]}"
255261

256262
ExitWithExitCode 0
257263
}

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ stages:
193193
buildId: $(AzDOBuildId)
194194
artifactName: PackageArtifacts
195195
checkDownloadedFiles: true
196-
itemPattern: |
197-
**
198-
!**/Microsoft.SourceBuild.Intermediate.*.nupkg
199196

200197
# This is necessary whenever we want to publish/restore to an AzDO private feed
201198
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here

0 commit comments

Comments
 (0)