Skip to content

Commit 8409237

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#11189)
* Update dependencies from https://github.com/dotnet/dotnet build 287070 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25513.102 -> 10.0.0-beta.25514.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25513.102 -> 10.0.0-rtm.25514.103) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rtm.25513.102 -> 10.0.0) * Backflow from https://github.com/dotnet/dotnet / 03ebd38 build 287340 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 287340 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25514.103 -> 10.0.0-beta.25515.107) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25514.103 -> 10.0.0-rtm.25515.107) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0 -> 10.0.0) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 47f516c commit 8409237

File tree

6 files changed

+77
-74
lines changed

6 files changed

+77
-74
lines changed

‎NuGet.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
<configuration>
44
<packageSources>
55
<clear />
6+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
7+
<!-- Begin: Package sources from dotnet-dotnet -->
8+
<add key="darc-pub-dotnet-dotnet-03ebd38" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-03ebd38e/nuget/v3/index.json" />
9+
<!-- End: Package sources from dotnet-dotnet -->
10+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
611
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
712
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
813
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/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.25513.102</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25513.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rtm.25513.102</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25513.102</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25513.102</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25515.107</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25515.107</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25515.107</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>10.0.0-rtm.25513.102</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rtm.25513.102</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rtm.25513.102</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>10.0.0-rtm.25513.102</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>10.0.0-rtm.25513.102</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rtm.25513.102</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>10.0.0-rtm.25513.102</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rtm.25513.102</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rtm.25513.102</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-rtm.25513.102</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rtm.25513.102</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rtm.25513.102</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>10.0.0-rtm.25513.102</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0-rtm.25513.102</SystemWindowsExtensionsPackageVersion>
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.25515.107</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>
3535
<!-- _git/dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rtm.25513.4</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="b502b6eeec0db06720ead7fd9570befa39a6b2f7" BarId="286841" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="03ebd38e3fd6b1068f44b5e4c560ad891c2b412e" BarId="287340" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25513.102">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25515.107">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
7+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25513.102">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25515.107">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
11+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rtm.25513.102">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
15+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rtm.25513.102">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
19+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25513.102">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25515.107">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
23+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rtm.25513.4">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rtm.25513.102">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
31+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rtm.25513.102">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
35+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rtm.25513.102">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
39+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rtm.25513.102">
41+
<Dependency Name="System.CodeDom" Version="10.0.0">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
43+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rtm.25513.102">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
47+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rtm.25513.102">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
51+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rtm.25513.102">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
55+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rtm.25513.102">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
59+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rtm.25513.102">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
63+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rtm.25513.102">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
67+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rtm.25513.102">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
71+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rtm.25513.102">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
75+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</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.25513.102">
87+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rtm.25515.107">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
89+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25513.102">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25515.107">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
93+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25513.102">
95+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25515.107">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
97+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25513.102">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25515.107">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
101+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25513.102">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25515.107">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
105+
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</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
@@ -31,7 +31,7 @@
3131
</PropertyGroup>
3232
<!-- Docs / Intellisense -->
3333
<PropertyGroup>
34-
<MicrosoftPrivateIntellisenseVersion>10.0.0-preview-20250912.1</MicrosoftPrivateIntellisenseVersion>
34+
<MicrosoftPrivateIntellisenseVersion>10.0.0-preview-20251006.1</MicrosoftPrivateIntellisenseVersion>
3535
</PropertyGroup>
3636
<!-- Packages that come from https://github.com/dotnet/arcade -->
3737
<PropertyGroup>

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ EnableInternalPackageSource() {
6666
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
6767
if [ "$?" == "0" ]; then
6868
echo "Enabling internal source '$PackageSourceName'."
69-
# Remove the disabled entry
70-
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
71-
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
72-
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
69+
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
70+
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
7371

7472
# Add the source name to PackageSources for credential handling
7573
PackageSources+=("$PackageSourceName")

‎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.25513.102",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

0 commit comments

Comments
 (0)