Skip to content

Commit c4530c8

Browse files
matkochmatkoch
committed
build: additional MSBuild infrastructure changes
1 parent d4b2a6a commit c4530c8

File tree

10 files changed

+21
-28
lines changed

10 files changed

+21
-28
lines changed

‎.run/Publish MSBuildTasks.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Publish MSBuildTasks" type="RunNativeExe" factoryName="Native Executable">
33
<option name="EXE_PATH" value="/usr/local/share/dotnet/dotnet" />
4-
<option name="PROGRAM_PARAMETERS" value="publish --framework netcoreapp2.1" />
4+
<option name="PROGRAM_PARAMETERS" value="publish --framework net9.0" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/source/Nuke.MSBuildTasks" />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />

‎.run/Run MSBuildTasks.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run MSBuildTasks" type="RunExe" factoryName=".NET Executable">
3-
<option name="EXE_PATH" value="/usr/local/share/dotnet/sdk/7.0.100/MSBuild.dll" />
3+
<option name="EXE_PATH" value="/usr/local/share/dotnet/sdk/9.0.100/MSBuild.dll" />
44
<option name="PROGRAM_PARAMETERS" value="/t:Clean;Restore;Publish;Pack /p:NukeTasksEnabled=True /bl" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/build" />
66
<option name="PASS_PARENT_ENVS" value="1" />

‎Directory.Packages.props‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,17 @@
6262
<ItemGroup>
6363
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
6464

65-
<PackageVersion Include="Microsoft.Build" Version="17.10.4" />
66-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.10.4" />
67-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.10.4" />
68-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.10.4" />
65+
<PackageVersion Include="Microsoft.Build" Version="17.12.6" />
66+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.12.6" />
67+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.12.6" />
68+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
6969
</ItemGroup>
7070

71-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
72-
<PackageVersion Update="Microsoft.Build" Version="17.5.0" />
73-
<PackageVersion Update="Microsoft.Build.Framework" Version="17.5.0" />
74-
<PackageVersion Update="Microsoft.Build.Tasks.Core" Version="17.5.0" />
75-
<PackageVersion Update="Microsoft.Build.Utilities.Core" Version="17.5.0" />
76-
</ItemGroup>
77-
78-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
79-
<PackageVersion Update="Microsoft.Build" Version="16.9.0" />
80-
<PackageVersion Update="Microsoft.Build.Framework" Version="16.9.0" />
81-
<PackageVersion Update="Microsoft.Build.Tasks.Core" Version="16.9.0" />
82-
<PackageVersion Update="Microsoft.Build.Utilities.Core" Version="16.9.0" />
71+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
72+
<PackageVersion Update="Microsoft.Build" Version="17.11.4" />
73+
<PackageVersion Update="Microsoft.Build.Framework" Version="17.11.4" />
74+
<PackageVersion Update="Microsoft.Build.Tasks.Core" Version="17.11.4" />
75+
<PackageVersion Update="Microsoft.Build.Utilities.Core" Version="17.11.4" />
8376
</ItemGroup>
8477

8578
</Project>

‎build/_build.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- Test properties for MSBuild integration -->
1717
<PropertyGroup>
1818
<NukeTasksEnabled Condition="'$(NukeTasksEnabled)' == ''">False</NukeTasksEnabled>
19-
<NukeTasksDirectory>$(MSBuildThisFileDirectory)\..\source\Nuke.MSBuildTasks\bin\Debug\netcoreapp2.1\publish</NukeTasksDirectory>
19+
<NukeTasksDirectory>$(MSBuildThisFileDirectory)\..\source\Nuke.MSBuildTasks\bin\Debug\net9.0\publish</NukeTasksDirectory>
2020

2121
<!-- <PackAsTool>True</PackAsTool>-->
2222
<!-- <ToolCommandName>build</ToolCommandName>-->

‎source/Nuke.Common/Nuke.Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<None Include="$(MSBuildProjectName).targets" PackagePath="build" Pack="true" />
3636
<None Include="..\Nuke.MSBuildTasks\Nuke.MSBuildTasks.targets" PackagePath="build\netcore" Pack="true" />
3737
<None Include="..\Nuke.MSBuildTasks\Nuke.MSBuildTasks.targets" PackagePath="build\netfx" Pack="true" />
38-
<None Include="..\Nuke.MSBuildTasks\bin\$(Configuration)\netcoreapp2.1\publish\**\*.*" PackagePath="build\netcore" Pack="true" />
38+
<None Include="..\Nuke.MSBuildTasks\bin\$(Configuration)\net9.0\publish\**\*.*" PackagePath="build\netcore" Pack="true" />
3939
<None Include="..\Nuke.MSBuildTasks\bin\$(Configuration)\net472\publish\**\*.*" PackagePath="build\netfx" Pack="true" />
4040
<None Include="..\Nuke.SourceGenerators\bin\$(Configuration)\netstandard2.0\*.dll" PackagePath="analyzers\dotnet\cs" Pack="true" />
4141
</ItemGroup>

‎source/Nuke.MSBuildTasks/ContextAwareTask.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ public abstract class ContextAwareTask : Task
2424

2525
private const string Subcategory = "Build";
2626

27-
protected virtual string ManagedDllDirectory => Path.GetDirectoryName(new Uri(GetType().GetTypeInfo().Assembly.CodeBase).LocalPath);
27+
protected virtual string ManagedDllDirectory => Path.GetDirectoryName(new Uri(GetType().GetTypeInfo().Assembly.Location).LocalPath);
2828

2929
protected virtual string UnmanagedDllDirectory => null;
3030

3131
public sealed override bool Execute()
3232
{
3333
#if NETCOREAPP
34-
var taskAssemblyPath = new Uri(GetType().GetTypeInfo().Assembly.CodeBase).LocalPath;
34+
var taskAssemblyPath = new Uri(GetType().GetTypeInfo().Assembly.Location).LocalPath;
3535
var context = new CustomAssemblyLoader(this);
3636
var inContextAssembly = context.LoadFromAssemblyPath(taskAssemblyPath);
3737
var innerTaskType = inContextAssembly.GetType(GetType().FullName.NotNull());

‎source/Nuke.MSBuildTasks/Nuke.MSBuildTasks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
5-
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
5+
<TargetFrameworks>net9.0;net472</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

‎source/Nuke.ProjectModel.Tests/ProjectModelTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public void ProjectTest()
2626
var action = new Action(() => project.GetMSBuildProject());
2727
action.Should().NotThrow();
2828

29-
project.GetTargetFrameworks().Should().Equal("net6.0", "net7.0", "net8.0");
29+
project.GetTargetFrameworks().Should().Equal("net8.0", "net9.0");
3030
project.HasPackageReference("Microsoft.Build.Locator").Should().BeTrue();
3131
project.GetPackageReferenceVersion("Microsoft.Build.Locator").Should().Be("1.7.8");
32-
project.GetPackageReferenceVersion("Microsoft.Build").Should().Be("17.10.4");
32+
project.GetPackageReferenceVersion("Microsoft.Build").Should().Be("17.12.6");
3333
}
3434

3535
[Fact]
@@ -42,6 +42,6 @@ public void MSBuildProjectTest()
4242

4343
var package = msbuildProject.GetItems("PackageVersion").FirstOrDefault(x => x.EvaluatedInclude == "Microsoft.Build");
4444
package.Should().NotBeNull();
45-
package.GetMetadataValue("Version").Should().Be("17.10.4");
45+
package.GetMetadataValue("Version").Should().Be("17.11.4");
4646
}
4747
}

‎source/Nuke.ProjectModel/Nuke.ProjectModel.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎source/Nuke.Tooling.Generator/Nuke.Tooling.Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>Nuke.CodeGeneration</RootNamespace>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)