Manually flow sdk's main #2352
Merged
Manually flow sdk's main #2352
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Flowing dotnet/sdk@3186232 to unblock the codeflow that got blocked due to double-backflowing to `main` from `10.0.1xx` and `main` VMR branches. dotnet/arcade-services#5231
Conflicts: src/sdk/Directory.Packages.props src/sdk/eng/Version.Details.props src/sdk/eng/Version.Details.xml src/sdk/global.json src/sdk/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildArgs.cs src/sdk/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs src/sdk/src/Cli/dotnet/Commands/Test/MTP/SolutionAndProjectUtility.cs src/sdk/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf src/sdk/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.ko.xlf src/sdk/src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md src/sdk/src/RazorSdk/Tool/Json/JsonDataReader.cs src/sdk/src/RazorSdk/Tool/Json/ObjectReaders_TagHelpers.cs src/sdk/src/RazorSdk/Tool/Json/ObjectWriters_TagHelpers.cs src/sdk/src/RazorSdk/Tool/Json/WellKnownPropertyNames.cs src/sdk/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Compression.targets src/sdk/src/StaticWebAssetsSdk/Tasks/ApplyCompressionNegotiation.cs src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs src/sdk/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj src/sdk/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj src/sdk/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj src/sdk/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj src/sdk/test/dotnet-new.IntegrationTests/DotnetNewTestTemplatesTests.cs src/source-manifest.json
|
FYI @marcpopMSFT @SimonZhao888 @tmat we have decided to unblock the codeflow for SDK by a forward flow of main first as we need some SDK binaries for this already. So we will instead merge this and then backflow it to SDK. |
This is the version available in source-build-reference-packages
akoeplinger
approved these changes
Sep 10, 2025
|
manual changes to source-manifest.json are expected |
This was referenced Sep 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Flowing dotnet/sdk@3186232 to unblock the codeflow that got blocked due to double-backflowing to
mainfrom10.0.1xxandmainVMR branches.dotnet/arcade-services#5231