Skip to content

Commit 7fa29e6

Browse files
Update dependency Microsoft.Build.Locator to 1.11.2 (#20)
* Update dependency Microsoft.Build.Locator to 1.11.2 * fix compilation (actually) * actually fix compilation --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: GreemDev <greemdev@ryujinx.app>
1 parent 5e0a605 commit 7fa29e6

12 files changed

Lines changed: 17 additions & 3 deletions

File tree

Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.5.2" />
2121
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
2222
<PackageVersion Include="NuGet.Packaging" Version="6.12.1" />
23+
<PackageVersion Include="NuGet.Frameworks" Version="6.12.1" />
2324
<PackageVersion Include="Octokit" Version="14.0.0" />
2425
<PackageVersion Include="Serilog" Version="4.3.1" />
2526
<PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
@@ -61,7 +62,7 @@
6162
</ItemGroup>
6263
<!-- MSBuild (Nuke.ProjectModel + Nuke.MSBuildTasks) -->
6364
<ItemGroup>
64-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
65+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.2" />
6566
<PackageVersion Include="Microsoft.Build" Version="18.0.2" />
6667
<PackageVersion Include="Microsoft.Build.Framework" Version="18.0.2" />
6768
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />

build/_build.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<NukeTasksEnabled Condition="'$(NukeTasksEnabled)' == ''">False</NukeTasksEnabled>
1919
<NukeTasksDirectory>$(MSBuildThisFileDirectory)\..\source\Nuke.MSBuildTasks\bin\Debug\net8.0\publish</NukeTasksDirectory>
2020

21+
<DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
22+
2123
<!-- <PackAsTool>True</PackAsTool>-->
2224
<!-- <ToolCommandName>build</ToolCommandName>-->
2325

@@ -65,6 +67,7 @@
6567
</ItemGroup>
6668

6769
<ItemGroup>
70+
<PackageReference Include="NuGet.Frameworks" Version="6.12.1" />
6871
<ProjectReference Include="..\source\Nuke.Components.GitHub\Nuke.Components.GitHub.csproj" />
6972
<ProjectReference Include="..\source\Nuke.Components.Forgejo\Nuke.Components.Forgejo.csproj" />
7073
<ProjectReference Include="..\source\Nuke.Components.GitLab\Nuke.Components.GitLab.csproj" />

source/Nuke.Build.Tests/Nuke.Build.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net10.0</TargetFramework>
55
<PackageId>GreemDev.Nuke.Build.Tests</PackageId>
6+
<DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
67
</PropertyGroup>
78

89
<ItemGroup>

source/Nuke.Build/Nuke.Build.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net10.0</TargetFramework>
55
<PackageId>GreemDev.Nuke.Build</PackageId>
6+
<DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
67
</PropertyGroup>
78

89
<ItemGroup>

source/Nuke.Common/Nuke.Common.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Azure.Identity" />
28+
<PackageReference Include="NuGet.Frameworks" ExcludeAssets="runtime" PrivateAssets="all" />
2829
<PackageReference Include="Azure.Security.KeyVault.Certificates" />
2930
<PackageReference Include="Azure.Security.KeyVault.Keys" />
3031
<PackageReference Include="Azure.Security.KeyVault.Secrets" />

source/Nuke.GlobalTool.Tests/Nuke.GlobalTool.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net10.0</TargetFramework>
55
<PackageId>GreemDev.Nuke.GlobalTool.Tests</PackageId>
6+
<DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
67
</PropertyGroup>
78

89
<ItemGroup>

source/Nuke.GlobalTool/Nuke.GlobalTool.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<RollForward>LatestMajor</RollForward>
88
<PackAsTool>true</PackAsTool>
99
<ToolCommandName>gruke</ToolCommandName>
10+
<DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

source/Nuke.ProjectModel.Tests/Nuke.ProjectModel.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<PropertyGroup>
44
<TargetFramework>net10.0</TargetFramework>
55
<PackageId>GreemDev.Nuke.ProjectModel.Tests</PackageId>
6+
<DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
67
</PropertyGroup>
78

89
<ItemGroup>
10+
<PackageReference Include="Microsoft.Build"/>
911
<ProjectReference Include="..\Nuke.Build.Shared\Nuke.Build.Shared.csproj" />
1012
<ProjectReference Include="..\Nuke.ProjectModel\Nuke.ProjectModel.csproj" />
1113
</ItemGroup>

source/Nuke.ProjectModel.Tests/ProjectModelTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void ProjectTest()
2828

2929
project.GetTargetFrameworks().Should().Equal("net8.0", "net9.0", "net10.0");
3030
project.HasPackageReference("Microsoft.Build.Locator").Should().BeTrue();
31-
project.GetPackageReferenceVersion("Microsoft.Build.Locator").Should().Be("1.7.8");
31+
project.GetPackageReferenceVersion("Microsoft.Build.Locator").Should().Be("1.11.2");
3232
project.GetPackageReferenceVersion("Microsoft.Build").Should().Be("18.0.2");
3333
}
3434

source/Nuke.ProjectModel/Nuke.ProjectModel.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<PackageId>GreemDev.Nuke.ProjectModel</PackageId>
6+
<DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
67
</PropertyGroup>
78

89
<ItemGroup>
@@ -13,7 +14,7 @@
1314

1415
<ItemGroup>
1516
<PackageReference Include="Microsoft.Build.Locator" />
16-
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
17+
<PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" PrivateAssets="all" />
1718
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
1819
<PackageReference Include="Microsoft.Build.Tasks.Core" ExcludeAssets="runtime" />
1920
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" />

0 commit comments

Comments
 (0)