Skip to content

[release/11.0.1xx-preview1] [dotnet] Fix publish BAR manifest step #24577

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

Merged
rolfbjarne merged 7 commits into from
Jan 30, 2026
Merged

[release/11.0.1xx-preview1] [dotnet] Fix publish BAR manifest step #24577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09b537b
[release/11.0.1xx-preview1] [dotnet] Fix publish BAR manifest step
rolfbjarne Jan 28, 2026
de8fffb
Try this
rolfbjarne Jan 29, 2026
11b066c
Try forcing net10.0
rolfbjarne Jan 29, 2026
d144bec
Only force sometimes.
rolfbjarne Jan 29, 2026
8cc3c0c
Use .NET 11 maybe
rolfbjarne Jan 30, 2026
5470e70
Revert "Use .NET 11 maybe"
rolfbjarne Jan 30, 2026
ece5179
force everywhere
rolfbjarne Jan 30, 2026
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
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.MacCatalyst.Ref/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>MacCatalyst</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-arm64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>MacCatalyst</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst-x64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>MacCatalyst</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.MacCatalyst.Runtime.maccatalyst/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>MacCatalyst</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.MacCatalyst.Sdk/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>MacCatalyst</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Ref/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Runtime.ios-arm/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Runtime.ios-arm64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Runtime.ios/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Runtime.iossimulator-arm64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Runtime.iossimulator-x64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Runtime.iossimulator-x86/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Sdk/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.iOS.Windows.Sdk/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>iOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.macOS.Ref/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>macOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.macOS.Runtime.osx-arm64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>macOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.macOS.Runtime.osx-x64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>macOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.macOS.Runtime.osx/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>macOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.macOS.Sdk/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>macOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.tvOS.Ref/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>tvOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.tvOS.Runtime.tvos-arm64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>tvOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.tvOS.Runtime.tvos/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>tvOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-arm64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>tvOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.tvOS.Runtime.tvossimulator-x64/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>tvOS</_PlatformName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/package/Microsoft.tvOS.Sdk/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<Sdk Name="Microsoft.DotNet.SharedFramework.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" />

<PropertyGroup>
<_PlatformName>tvOS</_PlatformName>
Expand Down
8 changes: 5 additions & 3 deletions dotnet/package/common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<Import Project="../targets/Microsoft.$(_PlatformName).Sdk.Versions.props" />

<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)</TargetFramework>
<TargetFramework Condition="'$(ForceStableDotNet)' != 'true'">net$(BundledNETCoreAppTargetFrameworkVersion)</TargetFramework>
<TargetFramework Condition="'$(ForceStableDotNet)' == 'true'">net10.0</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
<PackageType Condition="'$(PackageType)'==''">DotnetPlatform</PackageType>
<PackageVersion>$(_PackageVersion)</PackageVersion>
Expand Down Expand Up @@ -57,8 +58,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.DotNet.Arcade.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" PrivateAssets="all" GeneratePathProperty="true" />
<!-- Use net10.0 version since CI only has the .NET 10 SDK installed for BAR manifest publishing -->
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" PrivateAssets="all" />
<PackageReference Include="Microsoft.DotNet.Arcade.Sdk" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>

<!-- Remove the KnownFrameworkReference declared in ../targets/Microsoft.$(_PlatformName).Sdk.Versions.props so that we do not attempt to restore/include the ref/runtime packs that we are trying to build -->
Expand Down
4 changes: 4 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,9 @@
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
<!-- Manually updated versions -->
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<!-- Last version built for net10.0, needed for CI steps that only have the .NET 10 SDK installed (e.g., BAR manifest publishing) -->
<MicrosoftDotNetBuildTasksFeedPackageVersionNet10>11.0.0-beta.26060.102</MicrosoftDotNetBuildTasksFeedPackageVersionNet10>
<!-- force this everywhere -->
<MicrosoftDotNetBuildTasksFeedVersion>$(MicrosoftDotNetBuildTasksFeedPackageVersionNet10)</MicrosoftDotNetBuildTasksFeedVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions tools/devops/automation/templates/release/vs-insertion-prep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ stages:
-p:NupkgPath=$(Build.StagingDirectory)\nuget-signed
-p:PrereleaseIdentifier=$(PrereleaseIdentifier)
-bl:$(Build.StagingDirectory)\maestro-binlogs\generate-bar-manifest.binlog
-p:ForceStableDotNet=true
workingDirectory: $(Build.SourcesDirectory)\..
condition: and(succeeded(), eq('${{ parameters.pushNugetsToMaestro }}', 'true'))

Expand Down
Loading