Skip to content

Commit 34c7f40

Browse files
authored
Fix build issue from NuGet.Frameworks conflict (#3350)
1 parent f98a57d commit 34c7f40

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

global.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"sdk": {
33
"version": "10.0.100",
4-
"rollForward": "latestMinor"
4+
"rollForward": "latestMinor",
5+
"allowPrerelease": false
56
},
67
"msbuild-sdks": {
78
// Template packages (Stride.Templates.*) compile no code; NoTargets produces the nupkg

sources/Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<!-- 7.3.1 matches what .NET 10 SDK 10.0.202 ships. -->
8282
<PackageVersion Include="NuGet.Commands" Version="7.3.1" />
8383
<PackageVersion Include="NuGet.Configuration" Version="7.3.1" />
84+
<PackageVersion Include="NuGet.Frameworks" Version="7.3.1" />
8485
<PackageVersion Include="NuGet.PackageManagement" Version="7.3.1" />
8586
<PackageVersion Include="NuGet.ProjectModel" Version="7.3.1" />
8687
<PackageVersion Include="NuGet.Protocol" Version="7.3.1" />

sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
<PackageReference Include="Mono.Options" />
2121
</ItemGroup>
2222

23+
<ItemGroup>
24+
<!-- MSBuild is loaded from the resolved SDK (MSBuildLocator), which brings its own NuGet.Frameworks.
25+
Don't copy our (older) version to the output folder or project evaluation fails on newer SDKs. -->
26+
<PackageReference Include="NuGet.Frameworks" ExcludeAssets="runtime" PrivateAssets="all" />
27+
</ItemGroup>
28+
2329
<ItemGroup>
2430
<Compile Include="..\..\assets\Stride.AssetCompiler\Tasks\PackAssets.cs" Link="PackAssets.cs" />
2531
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">

0 commit comments

Comments
 (0)