Skip to content

Replace hardcoded net9.0 TFM in build .targets #348

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
merged 2 commits into from
Dec 18, 2023
Merged

Replace hardcoded net9.0 TFM in build .targets #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb9e83c
Replace hardcoded net9.0 TFM in build .targets
akoeplinger Dec 18, 2023
d9ab29f
Use NetToolCurrent
akoeplinger Dec 18, 2023
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
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23615.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23615.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
Expand Down
3 changes: 2 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>6.9.0-preview.1.64</NuGetBuildTasksPackageVersion>
<NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>
<!-- Testing -->
<!-- arcade -->
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23615.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23615.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23615.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.1-beta.23615.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
Expand Down
27 changes: 27 additions & 0 deletions ...oad.Utils.Generator.BuildTool/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,33 @@
<ProjectReference Include="..\Microsoft.DotNet.HotReload.Utils.Generator.Tasks\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.csproj" ExcludeAssets="runtime" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
</ItemGroup>

<PropertyGroup>
<HotReloadTargetsTemplateFile>Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets.in</HotReloadTargetsTemplateFile>
<HotReloadTargetsOutputFile>$(IntermediateOutputPath)Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets</HotReloadTargetsOutputFile>
</PropertyGroup>

<Target Name="ReplaceTemplateParametersInHotReloadTargetsTemplate"
Inputs="$(HotReloadTargetsTemplateFile)"
Outputs="$(HotReloadTargetsOutputFile)"
BeforeTargets="Build">

<GenerateFileFromTemplate TemplateFile="$(HotReloadTargetsTemplateFile)"
OutputPath="$(HotReloadTargetsOutputFile)"
Properties="NetToolCurrent=$(NetToolCurrent)">
<Output TaskParameter="ResolvedOutputPath" ItemName="FileWrites" />
</GenerateFileFromTemplate>

<ItemGroup>
<None Include="$(HotReloadTargetsOutputFile)" Pack="true">
<PackagePath>build/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets</PackagePath>
</None>
</ItemGroup>
</Target>

<Import Project="$(RepoRoot)eng\BuildTask.targets" />

</Project>
6 changes: 4 additions & 2 deletions ...tReload.Utils.Generator.BuildTool.targets → ...load.Utils.Generator.BuildTool.targets.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
<!-- If DotNetTool is undefined, we default to assuming 'dotnet' is on the path -->
<DotNetTool Condition="'$(DotNetTool)' == ''">dotnet</DotNetTool>

<_HotReloadDeltaGeneratorPath Condition="'$(_HotReloadDeltaGeneratorPath)' == ''">$(MSBuildThisFileDirectory)..\tools\net9.0\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.dll</_HotReloadDeltaGeneratorPath>
<_HotReloadDeltaGeneratorTFM Condition="'$(_HotReloadDeltaGeneratorTFM)' == ''">${NetToolCurrent}</_HotReloadDeltaGeneratorTFM>

<_HotReloadDeltaGeneratorPath Condition="'$(_HotReloadDeltaGeneratorPath)' == ''">$(MSBuildThisFileDirectory)..\tools\$(_HotReloadDeltaGeneratorTFM)\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.dll</_HotReloadDeltaGeneratorPath>

<_HotReloadDeltaGeneratorCommand>"$(DotNetTool)" "$(_HotReloadDeltaGeneratorPath)"</_HotReloadDeltaGeneratorCommand>

<_HotReloadDeltaGeneratorTasksPath Condition="'$(_HotReloadDeltaGeneratorTasksPath)' == ''">$(MSBuildThisFileDirectory)..\tools\net9.0\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.dll</_HotReloadDeltaGeneratorTasksPath>
<_HotReloadDeltaGeneratorTasksPath Condition="'$(_HotReloadDeltaGeneratorTasksPath)' == ''">$(MSBuildThisFileDirectory)..\tools\$(_HotReloadDeltaGeneratorTFM)\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.dll</_HotReloadDeltaGeneratorTasksPath>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/hotreload-delta-gen/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Then run the tool as `hotreload-delta-gen` assuming that `${HOME}/.dotnet/tools`

Run `build.sh -restore -build -publish -pack -c Release` from the repo root.

That will create the executable `artifacts/bin/hotreload-delta-gen/Release/net9.0/publish/hotreload-delta-gen`.
That will create the executable `artifacts/bin/hotreload-delta-gen/Release/<dotnet version>/publish/hotreload-delta-gen`.


## How to use it
Expand Down
4 changes: 3 additions & 1 deletion tests/BuildTool/ImportExplicitly.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

<!-- Set the paths for the generator buildtool and tasks assemblies explicitly so that we can Import the in-tree BuildTool.targets file -->
<PropertyGroup>
<InTreeGeneratorBuildToolTargetsPath>$(RepoRoot)src\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\build\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets</InTreeGeneratorBuildToolTargetsPath>
<!-- Override the TFM in the template file -->
<_HotReloadDeltaGeneratorTFM>$(NetCurrent)</_HotReloadDeltaGeneratorTFM>
<InTreeGeneratorBuildToolTargetsPath>$(RepoRoot)src\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets.in</InTreeGeneratorBuildToolTargetsPath>
<_HotReloadDeltaGeneratorPath>$(BaseOutputPath)..\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\$(Configuration)\$(TargetFramework)\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.dll</_HotReloadDeltaGeneratorPath>
<_HotReloadDeltaGeneratorTasksPath>$(BaseOutputPath)..\Microsoft.DotNet.HotReload.Utils.Generator.Tasks\$(Configuration)\$(TargetFramework)\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.dll</_HotReloadDeltaGeneratorTasksPath>
</PropertyGroup>
Expand Down
5 changes: 3 additions & 2 deletions tests/HotReload.Generator/EnC.Tests/TempMSBuildWorkspaceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,12 @@ private void PrepareGlobalFiles()

protected async Task<Project> PrepareProject(CancellationToken cancellationToken = default)
{
(var solution, var projectId) = await CreateProject("""
string targetFramework = $"net{Environment.Version.Major}.{Environment.Version.Minor}";
(var solution, var projectId) = await CreateProject($"""
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>{targetFramework}</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
</PropertyGroup>
<ItemGroup>
Expand Down