Skip to content

[release/10.0] Source code updates from dotnet/dotnet #13961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Parent: [release/10.0] Fix 13829 Dark Mode: Button ForeColor ignored in Dark Mode when FlatStyle is Flat/Popup and Form.ForeColor Is set
wants to merge 13 commits into from
Closed

[release/10.0] Source code updates from dotnet/dotnet #13961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
12ba05b
Update dependencies from https://github.com/dotnet/dotnet build 287070
dotnet-maestro[bot] Oct 15, 2025
dfe52d7
Backflow from https://github.com/dotnet/dotnet / 03ebd38 build 287340
dotnet-maestro[bot] Oct 16, 2025
5b978cb
Update dependencies from https://github.com/dotnet/dotnet build 287340
dotnet-maestro[bot] Oct 16, 2025
b79cc73
Backflow from https://github.com/dotnet/dotnet / 79c85d9 build 287426
dotnet-maestro[bot] Oct 17, 2025
95ed17c
Update dependencies from https://github.com/dotnet/dotnet build 287426
dotnet-maestro[bot] Oct 17, 2025
2ab6793
Update dependencies from https://github.com/dotnet/dotnet build 287652
dotnet-maestro[bot] Oct 18, 2025
5008bb8
Update dependencies from https://github.com/dotnet/dotnet build 287710
dotnet-maestro[bot] Oct 19, 2025
c62d099
Update dependencies from https://github.com/dotnet/dotnet build 287756
dotnet-maestro[bot] Oct 20, 2025
3456c27
Update dependencies from https://github.com/dotnet/dotnet build 287866
dotnet-maestro[bot] Oct 21, 2025
833297a
Update dependencies from https://github.com/dotnet/dotnet build 287966
dotnet-maestro[bot] Oct 22, 2025
c332e41
Merge release/10.0 into darc-release/10.0-e6c8aade-cb27-4499-b845-3d1…
dotnet-maestro[bot] Oct 23, 2025
0d70353
Update dependencies from https://github.com/dotnet/dotnet build 288065
dotnet-maestro[bot] Oct 23, 2025
c8142d2
Update NuGet.config package source key
Shyam-Gupta Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-44c449ac" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-44c449ac/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
Expand Down
50 changes: 25 additions & 25 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25513.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>10.0.0-rtm.25513.102</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rtm.25513.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rtm.25513.102</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rtm.25513.102</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25513.102</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rtm.25513.102</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rtm.25513.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rtm.25513.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rtm.25513.102</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rtm.25513.102</SystemConfigurationConfigurationManagerPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rtm.25513.102</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-rtm.25513.102</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rtm.25513.102</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rtm.25513.102</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rtm.25513.102</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rtm.25513.102</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rtm.25513.102</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rtm.25513.102</SystemWindowsExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25521.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25521.107</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25521.107</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25521.107</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25521.107</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25521.107</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25521.107</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>10.0.0</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25521.107</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>10.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
102 changes: 51 additions & 51 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="b502b6eeec0db06720ead7fd9570befa39a6b2f7" BarId="286841" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="44c449accc808f07c97eeb29652cfa1870de9352" BarId="288065" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25513.102">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25521.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.Resources.Extensions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.Windows.Extensions" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rtm.25513.102">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rtm.25513.102">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rtm.25513.102">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rtm.25513.102">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rtm.25513.102">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.Text.Json" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rtm.25513.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rtm.25513.102">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.CodeDom" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.0-rtm.25513.102">
<Dependency Name="System.IO.Hashing" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25513.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25521.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25513.102">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25521.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25513.102">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25521.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25513.102">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25521.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25513.102">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25521.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25513.102">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25521.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25513.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25521.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b502b6eeec0db06720ead7fd9570befa39a6b2f7</Sha>
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</PropertyGroup>
<!-- Docs / Intellisense -->
<PropertyGroup>
<MicrosoftPrivateIntellisenseVersion>10.0.0-preview-20250912.1</MicrosoftPrivateIntellisenseVersion>
<MicrosoftPrivateIntellisenseVersion>10.0.0-preview-20251006.1</MicrosoftPrivateIntellisenseVersion>
</PropertyGroup>
<!-- XUnit-related (not extensions) -->
<PropertyGroup>
Expand Down
6 changes: 2 additions & 4 deletions eng/common/SetupNugetSources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,8 @@ EnableInternalPackageSource() {
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
if [ "$?" == "0" ]; then
echo "Enabling internal source '$PackageSourceName'."
# Remove the disabled entry
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"

# Add the source name to PackageSources for credential handling
PackageSources+=("$PackageSourceName")
Expand Down
12 changes: 6 additions & 6 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100-rc.1.25451.107",
"version": "10.0.100-rc.2.25502.107",
"allowPrerelease": true,
"rollForward": "latestFeature",
"paths": [
Expand All @@ -10,7 +10,7 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.100-rc.1.25451.107",
"dotnet": "10.0.100-rc.2.25502.107",
"runtimes": {
"dotnet/x64": [
"$(MicrosoftNETCorePlatformsPackageVersion)"
Expand All @@ -21,11 +21,11 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.102",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25513.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25521.107",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25521.107",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25521.107",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.0-rtm.25513.102"
"Microsoft.NET.Sdk.IL": "10.0.0"
},
"native-tools": {
"cmake": "latest"
Expand Down
2 changes: 1 addition & 1 deletion ....Private.Winforms/sdk/dotnet-windowsdesktop/System.Windows.Forms.FileClassification.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<FrameworkListFileClass Include="Microsoft.VisualBasic.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="Microsoft.VisualBasic.Forms.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Design.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Drawing.Common.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Drawing.Common.dll" Profile="WindowsForms;WPF" />
<FrameworkListFileClass Include="System.Drawing.Design.dll" Profile="WindowsForms" />
<FrameworkListFileClass Include="System.Drawing.dll" Profile="WindowsForms" />
<!-- System.Private.Windows.Core is now used by both WPF and Windows Forms -->
Expand Down
Loading