Skip to content

Commit d75b8ad

Browse files
JanviMahajan14JanviMahajan14
authored
Merge pull request #11231 from dotnet/darc-release/10.0-96d7be4a-d285-4298-b7c4-548f49f0a8c6
[release/10.0] Source code updates from dotnet/dotnet
2 parents 756c689 + 2f57518 commit d75b8ad

File tree

7 files changed

+101
-75
lines changed

7 files changed

+101
-75
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-dotnet -->
8-
<add key="darc-pub-dotnet-dotnet-ba86126" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ba861262/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-dotnet-e17b0d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-e17b0d08/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-dotnet -->
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1111
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

‎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>10.0.0-beta.25531.102</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25531.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.1-servicing.25555.106</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.1-servicing.25555.106</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.1-servicing.25555.106</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>10.0.0</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>10.0.0</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>10.0.0</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>10.0.0</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>10.0.0</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rtm.25531.102</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>10.0.0</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>10.0.1</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.1</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>10.0.1</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>10.0.1</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>10.0.1</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.1</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>10.0.1</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.1-servicing.25555.106</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.1</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.1</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.1</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>10.0.1</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>10.0.1</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.1</SystemWindowsExtensionsPackageVersion>
3535
<!-- _git/dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.1-servicing.25555.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="ba86126261026d26f7c30cd3434680d3965a88cf" BarId="289152" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="e17b0d08def649f30aed9c09cf4a2c5741a3c76c" BarId="289695" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25531.102">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.1-servicing.25555.106">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
7+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25531.102">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.1-servicing.25555.106">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
11+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.1">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
15+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.1">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
19+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25531.102">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.1-servicing.25555.106">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
23+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.1-servicing.25555.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>9202df6550bd39e2af8d530a635d96ce070cd744</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.1">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
31+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.1">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
35+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.1">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
39+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0">
41+
<Dependency Name="System.CodeDom" Version="10.0.1">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
43+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.1">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
47+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.1">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
51+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.1">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
55+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.1">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
59+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.1">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
63+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.1">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
67+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.1">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
71+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.1">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
75+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,25 +84,25 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rtm.25531.102">
87+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.1-servicing.25555.106">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
89+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25555.106">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
93+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25531.102">
95+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25555.106">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
97+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25531.102">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25555.106">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
101+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25531.102">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25555.106">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
105+
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
106106
</Dependency>
107107
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
108108
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<MajorVersion>10</MajorVersion>
66
<MinorVersion>0</MinorVersion>
77
<PatchVersion>1</PatchVersion>
8-
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
8+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
99
<PreReleaseVersionIteration></PreReleaseVersionIteration>
1010
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1111
<!--

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3-
# disabled internal Maestro (darc-int*) feeds.
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
3+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
4+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
45
#
56
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
67
#
@@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
173174
}
174175
}
175176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
179+
if ($dotnetEngSource -ne $null) {
180+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
181+
}
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
185+
if ($dotnetToolsSource -ne $null) {
186+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
187+
}
188+
176189
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env bash
22

33
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5-
# disabled internal Maestro (darc-int*) feeds.
4+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
5+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
6+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
67
#
78
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
89
#
@@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
173174
fi
174175
done
175176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
179+
if [ "$?" == "0" ]; then
180+
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
181+
fi
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
185+
if [ "$?" == "0" ]; then
186+
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
187+
fi
188+
176189
# I want things split line by line
177190
PrevIFS=$IFS
178191
IFS=$'\n'

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
}
2525
},
2626
"msbuild-sdks": {
27-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25555.106",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

0 commit comments

Comments
 (0)