Skip to content

Commit 80f4580

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#11154)
* Update dependencies from https://github.com/dotnet/dotnet build 285151 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25476.103 -> 11.0.0-beta.25479.108) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25476.103 -> 10.0.0-rc.1.25479.108) * Update dependencies from https://github.com/dotnet/dotnet build 285219 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25479.108 -> 11.0.0-beta.25480.105) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25479.108 -> 10.0.0-rc.1.25480.105) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 6916c2e commit 80f4580

File tree

11 files changed

+78
-78
lines changed

11 files changed

+78
-78
lines changed

‎eng/Version.Details.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props
88
<!-- dotnet/dotnet dependencies -->
99
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25476.103</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25476.103</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25476.103</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25476.103</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25476.103</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25476.103</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25476.103</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25476.103</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25480.105</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25480.105</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25480.105</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25480.105</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25480.105</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25480.105</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25480.105</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25480.105</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>10.0.0-rc.1.25476.103</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25476.103</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25476.103</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25476.103</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25476.103</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25476.103</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25476.103</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25476.103</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25476.103</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25476.103</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25476.103</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25476.103</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25476.103</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25476.103</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>10.0.0-rc.1.25480.105</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25480.105</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25480.105</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25480.105</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25480.105</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25480.105</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25480.105</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25480.105</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25480.105</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25480.105</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25480.105</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25480.105</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25480.105</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25480.105</SystemWindowsExtensionsPackageVersion>
3535
<!-- _git/dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25466.1</MicrosoftDotNetWpfDncEngPackageVersion>
3737
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d" BarId="284884" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="1be39deac0ebffe1635a70f2b24f454e850f7638" BarId="285219" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25476.103">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25480.105">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
7+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25476.103">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25480.105">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
11+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25476.103">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25480.105">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
15+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25476.103">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25480.105">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
19+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25476.103">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25480.105">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
23+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25466.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>3567f4b428acc1a49fda38d150415482cc916dd8</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25476.103">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25480.105">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
31+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25476.103">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25480.105">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
35+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25476.103">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25480.105">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
39+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25476.103">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25480.105">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
43+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25476.103">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25480.105">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
47+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25476.103">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25480.105">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
51+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25476.103">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25480.105">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
55+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25476.103">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25480.105">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
59+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25476.103">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25480.105">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
63+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25476.103">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25480.105">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
67+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25476.103">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25480.105">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
71+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25476.103">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25480.105">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
75+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,21 +84,21 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25476.103">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25480.105">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
89+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25476.103">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25480.105">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
93+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25476.103">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25480.105">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
97+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25476.103">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25480.105">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
101+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
102102
</Dependency>
103103
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
104104
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
@@ -109,9 +109,9 @@
109109
<Uri>https://github.com/dotnet/dotnet</Uri>
110110
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
111111
</Dependency>
112-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25476.103">
112+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25480.105">
113113
<Uri>https://github.com/dotnet/dotnet</Uri>
114-
<Sha>f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d</Sha>
114+
<Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
115115
</Dependency>
116116
</ToolsetDependencies>
117117
</Dependencies>

‎eng/common/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ runtime_source_feed=''
9292
runtime_source_feed_key=''
9393

9494
properties=()
95-
while [[ $# > 0 ]]; do
95+
while [[ $# -gt 0 ]]; do
9696
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9797
case "$opt" in
9898
-help|-h)

‎eng/common/darc-init.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ darcVersion=''
55
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20'
66
verbosity='minimal'
77

8-
while [[ $# > 0 ]]; do
8+
while [[ $# -gt 0 ]]; do
99
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
1010
case "$opt" in
1111
--darcversion)

‎eng/common/dotnet-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ architecture=''
1818
runtime='dotnet'
1919
runtimeSourceFeed=''
2020
runtimeSourceFeedKey=''
21-
while [[ $# > 0 ]]; do
21+
while [[ $# -gt 0 ]]; do
2222
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
2323
case "$opt" in
2424
-version|-v)

‎eng/common/dotnet.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source $scriptroot/tools.sh
1919
InitializeDotNetCli true # install
2020

2121
# Invoke acquired SDK with args if they are provided
22-
if [[ $# > 0 ]]; then
22+
if [[ $# -gt 0 ]]; then
2323
__dotnetDir=${_InitializeDotNetCli}
2424
dotnetPath=${__dotnetDir}/dotnet
2525
${dotnetPath} "$@"

‎eng/common/internal-feed-operations.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ operation=''
100100
authToken=''
101101
repoName=''
102102

103-
while [[ $# > 0 ]]; do
103+
while [[ $# -gt 0 ]]; do
104104
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
105105
case "$opt" in
106106
--operation)

‎eng/common/post-build/nuget-verification.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
[CmdletBinding(PositionalBinding = $false)]
3131
param(
3232
[string]$NuGetExePath,
33-
[string]$PackageSource = "https://api.nuget.org/v3/index.json",
33+
[string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
3434
[string]$DownloadPath,
3535
[Parameter(ValueFromRemainingArguments = $true)]
3636
[string[]]$args

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ try {
6868
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6969
}
7070
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
71-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
71+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty
7272
}
7373
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7474
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
394394

395395
# If the version of msbuild is going to be xcopied,
396396
# use this version. Version matches a package here:
397-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
398-
$defaultXCopyMSBuildVersion = '17.13.0'
397+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16
398+
$defaultXCopyMSBuildVersion = '17.14.16'
399399

400400
if (!$vsRequirements) {
401401
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

0 commit comments

Comments
 (0)