Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 IntelliTect.Multitool.AotTest/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
return 1;
}

// RepositoryPaths is excluded: its static initializer reads a build-time temp file
// RepositoryPaths is excluded: its static initializer reads a build-time file from the output directory
// that doesn't exist at AOT runtime. The class is AOT-compatible (file I/O + LINQ only).

Console.WriteLine("AOT test passed.");
Expand Down
4 changes: 1 addition & 3 deletions IntelliTect.Multitool/Build/IntelliTect.Multitool.targets
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@

<Target Name="WriteLaunchers" AfterTargets="CopyFilesToOutputDirectory">
<PropertyGroup>
<TempStagingPath Condition="'$(TempStagingPath)' == ''">$([System.IO.Path]::GetTempPath())</TempStagingPath>
<LUTInformation>
BuildingForLiveUnitTesting::$(BuildingForLiveUnitTesting)
SolutionDir::$(SolutionDir)
ProjectPath::$(ProjectPath)
</LUTInformation>
</PropertyGroup>

<WriteLinesToFile File="$(TempStagingPath)\IntelliTect.MultiTool.BuildVariables.tmp" Overwrite="true" Lines="$(LUTInformation)" Condition="'$(SolutionDir)' != ''" />
<WriteLinesToFile File="$(TempStagingPath)\IntelliTect.MultiTool.BuildVariables.tmp" Overwrite="true" Lines="$(LUTInformation)" Condition="'$(SolutionDir)' == '' AND !Exists('$(TempStagingPath)\IntelliTect.MultiTool.BuildVariables.tmp')" />
<WriteLinesToFile File="$(OutDir)IntelliTect.MultiTool.BuildVariables.tmp" Overwrite="true" Lines="$(LUTInformation)" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion IntelliTect.Multitool/RepositoryPaths.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public static class RepositoryPaths
/// <summary>
/// Holds the key value pairs of the build variables that this class can use.
/// </summary>
public static ReadOnlyDictionary<string, string?> BuildVariables { get; } = new(File.ReadAllLines(Path.Combine(Path.GetTempPath(), BuildVariableFileName))
public static ReadOnlyDictionary<string, string?> BuildVariables { get; } = new(File.ReadAllLines(Path.Combine(AppContext.BaseDirectory, BuildVariableFileName))
.Select(line => line.Split("::"))
.ToDictionary(split => split[0].Trim(),
split => !string.IsNullOrEmpty(split[1]) ? split[1].Trim() : null));
Expand Down
Loading