diff --git a/NuGet.config b/NuGet.config index 508adeabd2d..0f717c0b607 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,11 @@ + + + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fbdc2fca7b8..a5591a73789 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 + 10.0.0-beta.25521.107 + 10.0.0-beta.25521.107 + 10.0.0-beta.25521.107 + 10.0.0-beta.25521.107 + 10.0.0-beta.25521.107 + 10.0.0-beta.25521.107 + 10.0.0-beta.25521.107 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0-rtm.25521.107 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f937f541d3..704944d2332 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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 target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 44c449accc808f07c97eeb29652cfa1870de9352 diff --git a/eng/Versions.props b/eng/Versions.props index 7d69d564aaf..aa49b33e946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 10.0.0-preview-20250912.1 + 10.0.0-preview-20251006.1 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef01..b97cc536379 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -66,10 +66,8 @@ EnableInternalPackageSource() { grep -i " /dev/null if [ "$?" == "0" ]; then echo "Enabling internal source '$PackageSourceName'." - # Remove the disabled entry - local OldDisableValue="" - local NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + # Remove the disabled entry (including any surrounding comments or whitespace on the same line) + sed -i.bak "//d" "$ConfigFile" # Add the source name to PackageSources for credential handling PackageSources+=("$PackageSourceName") diff --git a/global.json b/global.json index 9e2d84d6811..86db9e2b638 100644 --- a/global.json +++ b/global.json @@ -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": [ @@ -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)" @@ -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" diff --git a/pkg/Microsoft.Private.Winforms/sdk/dotnet-windowsdesktop/System.Windows.Forms.FileClassification.props b/pkg/Microsoft.Private.Winforms/sdk/dotnet-windowsdesktop/System.Windows.Forms.FileClassification.props index 98c385314f2..46f0d011e22 100644 --- a/pkg/Microsoft.Private.Winforms/sdk/dotnet-windowsdesktop/System.Windows.Forms.FileClassification.props +++ b/pkg/Microsoft.Private.Winforms/sdk/dotnet-windowsdesktop/System.Windows.Forms.FileClassification.props @@ -8,7 +8,7 @@ - +