Skip to content

Commit 5d9058e

Browse files
committed
Merge branch 'devel'
2 parents 6d92634 + 50fe8f9 commit 5d9058e

37 files changed

+184
-93
lines changed

README.ja.md

+4
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,10 @@ Apache-v2
861861

862862
## History
863863

864+
* 1.16.0:
865+
* .NET 9.0 SDKでEpoxy.Buildがロードされるときに、パスが見つからない例外を修正しました。
866+
* MAUIの依存関係をnet8.0以降で強制的に更新しました。
867+
* Avalonia (<=10) と OpenSilver パッケージは最終リリースです。次のリリースでは削除されます。
864868
* 1.15.0:
865869
* 新しいイベントハンドリング機能として、 `Fountain/Well` を追加。
866870
* Xamarin Formsを廃止。

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,10 @@ Apache-v2
856856

857857
## History
858858

859+
* 1.16.0:
860+
* Fixed path not found exception when Epoxy.Build loading on .NET 9.0 SDK.
861+
* Force updated MAUI dependencies on net8.0 or newer, because of their package dependencies.
862+
* Avalonia (<=10) and OpenSilver packages are last release. Will drop out in the next release.
859863
* 1.15.0:
860864
* Added `Fountain/Well` as a new event handling feature.
861865
* Deprecated Xamarin Forms.

build-nupkg.bat

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@echo off
22

3-
git clean -xfd
3+
rem git clean -xfd
4+
rem dotnet workload restore
5+
46
mkdir artifacts
57

68
echo.

playground.FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia.Desktop/EpoxyHello.Avalonia.Desktop.fsproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFrameworks>net48;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
5+
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
56
</PropertyGroup>
67

78
<ItemGroup>
89
<PackageReference Update="FSharp.Core" Version="8.0.200" />
910
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
10-
<PackageReference Include="Avalonia" Version="0.10.21" />
11-
<PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
12-
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
11+
<PackageReference Include="Avalonia" Version="0.10.22" />
12+
<PackageReference Include="Avalonia.Desktop" Version="0.10.22" />
13+
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
1314
<PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
15+
<PackageReference Include="System.Drawing.Common" Version="8.0.11" />
1416
</ItemGroup>
1517

1618
<ItemGroup>

playground.FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia/EpoxyHello.Avalonia.fsproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
<ItemGroup>
1010
<PackageReference Update="FSharp.Core" Version="8.0.200" />
11-
<PackageReference Include="Avalonia" Version="0.10.21" />
12-
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
11+
<PackageReference Include="Avalonia" Version="0.10.22" />
12+
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
1313
<PackageReference Include="FSharp.Control.FusionTasks" Version="2.6.0" />
1414
<PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
1515
</ItemGroup>

playground.FSharp/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.fsproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33

44
<PropertyGroup>
55
<OutputType>WinExe</OutputType>
6-
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
6+
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
77
<IncludeAvaloniaGenerators>true</IncludeAvaloniaGenerators>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Update="FSharp.Core" Version="8.0.200" />
1212
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
13-
<PackageReference Include="Avalonia" Version="11.0.10" />
14-
<PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
15-
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" />
16-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
13+
<PackageReference Include="Avalonia" Version="11.2.2" />
14+
<PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
15+
<PackageReference Include="Avalonia.Diagnostics" Version="11.2.2" />
16+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
1717
<PackageReference Include="FSharp.Control.FusionTasks" Version="2.6.0" />
1818
<PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
1919
</ItemGroup>

playground.FSharp/EpoxyHello.Wpf/EpoxyHello.Wpf.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>WinExe</OutputType>
7-
<TargetFrameworks>net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
7+
<TargetFrameworks>net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
88
<UseWPF>true</UseWPF>
99
</PropertyGroup>
1010

playground/EpoxyHello.Avalonia/EpoxyHello.Avalonia.Desktop/EpoxyHello.Avalonia.Desktop.csproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFrameworks>net48;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
5+
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
56
</PropertyGroup>
67
<ItemGroup>
78
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
8-
<PackageReference Include="Avalonia" Version="0.10.21" />
9-
<PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
10-
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
9+
<PackageReference Include="Avalonia" Version="0.10.22" />
10+
<PackageReference Include="Avalonia.Desktop" Version="0.10.22" />
11+
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
12+
<PackageReference Include="System.Drawing.Common" Version="8.0.11" />
1113
</ItemGroup>
1214
<ItemGroup>
1315
<ProjectReference Include="..\..\..\src\Epoxy.Core.Avalonia\Epoxy.Core.Avalonia.csproj" />

playground/EpoxyHello.Avalonia/EpoxyHello.Avalonia/EpoxyHello.Avalonia.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Avalonia" Version="0.10.21" />
10-
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
9+
<PackageReference Include="Avalonia" Version="0.10.22" />
10+
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
1111
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
1212
</ItemGroup>
1313
<ItemGroup>

playground/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
<PropertyGroup>
55
<OutputType>WinExe</OutputType>
6-
<TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
77
<IncludeAvaloniaGenerators>true</IncludeAvaloniaGenerators>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
12-
<PackageReference Include="Avalonia" Version="11.0.10" />
13-
<PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
14-
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" />
15-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
12+
<PackageReference Include="Avalonia" Version="11.2.2" />
13+
<PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
14+
<PackageReference Include="Avalonia.Diagnostics" Version="11.2.2" />
15+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

playground/EpoxyHello.Wpf/EpoxyHello.Wpf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>WinExe</OutputType>
7-
<TargetFrameworks>net461;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
7+
<TargetFrameworks>net461;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
88
<UseWPF>true</UseWPF>
99
</PropertyGroup>
1010

src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="RelaxVersioner" Version="3.3.0" PrivateAssets="All" />
12+
<PackageReference Include="RelaxVersioner" Version="3.9.0" PrivateAssets="All" />
1313
</ItemGroup>
1414

1515
<!-- https://github.com/xamarin/xamarin-macios/issues/8601#issuecomment-699128097 -->

src/Epoxy.Avalonia/Epoxy.Avalonia.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<AssemblyName>Epoxy</AssemblyName>
5-
<TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
66

77
<AssemblyTitle>Epoxy.Avalonia</AssemblyTitle>
88

src/Epoxy.Avalonia/Epoxy.Avalonia.nuspec

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<dependency id="Epoxy.Build" version="$PackageVersion$" />
6060
<dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />
6161
</group>
62+
<group targetFramework="net9.0">
63+
<dependency id="Epoxy.Build" version="$PackageVersion$" />
64+
<dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />
65+
</group>
6266
<group targetFramework=".NETStandard2.0">
6367
<dependency id="Epoxy.Build" version="$PackageVersion$" />
6468
<dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />

src/Epoxy.Avalonia11/Epoxy.Avalonia11.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<AssemblyName>Epoxy</AssemblyName>
5-
<TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
66

77
<AssemblyTitle>Epoxy.Avalonia11</AssemblyTitle>
88

src/Epoxy.Avalonia11/Epoxy.Avalonia11.nuspec

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<dependency id="Epoxy.Build" version="$PackageVersion$" />
6060
<dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />
6161
</group>
62+
<group targetFramework="net9.0">
63+
<dependency id="Epoxy.Build" version="$PackageVersion$" />
64+
<dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />
65+
</group>
6266
<group targetFramework=".NETStandard2.0">
6367
<dependency id="Epoxy.Build" version="$PackageVersion$" />
6468
<dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />

src/Epoxy.Build/Epoxy.Build.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<AssemblyName>eb</AssemblyName>
6-
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
77
<AssemblyTitle>Epoxy.Build</AssemblyTitle>
88
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
99

@@ -12,8 +12,8 @@
1212
<IncludeBuildOutput>false</IncludeBuildOutput>
1313
</PropertyGroup>
1414

15-
<PropertyGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1') OR ('$(TargetFramework)' == 'net5.0') OR ('$(TargetFramework)' == 'net6.0') OR ('$(TargetFramework)' == 'net7.0') OR ('$(TargetFramework)' == 'net8.0')">
16-
<RollForward>Minor</RollForward>
15+
<PropertyGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1') OR ('$(TargetFramework)' == 'net5.0') OR ('$(TargetFramework)' == 'net6.0') OR ('$(TargetFramework)' == 'net7.0') OR ('$(TargetFramework)' == 'net8.0') OR ('$(TargetFramework)' == 'net9.0')">
16+
<RollForward>LatestMajor</RollForward>
1717
</PropertyGroup>
1818

1919
<ItemGroup>

src/Epoxy.Build/Epoxy.Build.nuspec

+1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727
<file src="bin\$Configuration$\net6.0\*.*" target="tools/net6.0" />
2828
<file src="bin\$Configuration$\net7.0\*.*" target="tools/net7.0" />
2929
<file src="bin\$Configuration$\net8.0\*.*" target="tools/net8.0" />
30+
<file src="bin\$Configuration$\net9.0\*.*" target="tools/net9.0" />
3031
</files>
3132
</package>

src/Epoxy.Build/build/Epoxy.Build.props

+77
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,81 @@
3737
<_EB_ScriptBaseDir>$(MSBuildThisFileDirectory)</_EB_ScriptBaseDir>
3838
</PropertyGroup>
3939

40+
<!-- ======================== -->
41+
<!-- Custom task -->
42+
43+
<!-- https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild-roslyncodetaskfactory?view=vs-2022#provide-backward-compatibility -->
44+
<Choose>
45+
<When Condition="'$(MSBuildVersion.Substring(0,2))' &gt;= 16 OR ('$(MSBuildVersion.Substring(0,2))' == 15 AND '$(MSBuildVersion.Substring(3,1))' &gt;= 8)">
46+
<PropertyGroup>
47+
<_EB_TaskFactory>RoslynCodeTaskFactory</_EB_TaskFactory>
48+
</PropertyGroup>
49+
</When>
50+
<Otherwise>
51+
<PropertyGroup>
52+
<_EB_TaskFactory>CodeTaskFactory</_EB_TaskFactory>
53+
</PropertyGroup>
54+
</Otherwise>
55+
</Choose>
56+
57+
<UsingTask
58+
TaskName="_EB_GetCombinedReferencesBasePath"
59+
TaskFactory="$(_EB_TaskFactory)"
60+
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
61+
<ParameterGroup>
62+
<References ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
63+
<CombinedReferencesBasePath Output="true" />
64+
</ParameterGroup>
65+
<Task>
66+
<Using Namespace="System"/>
67+
<Using Namespace="System.IO"/>
68+
<!-- HACK: Will cause compilation error by using `System.Collection.Generic` and/or `System.Linq` on MacOS
69+
(Maybe related both mono environment and unreferenced core assembly on `RoslynCodeTaskFactory`) -->
70+
<Using Namespace="System.Collections"/>
71+
<Using Namespace="Microsoft.Build.Framework"/>
72+
<Code Type="Fragment" Language="cs">
73+
<![CDATA[
74+
var candidates = new Hashtable();
75+
foreach (var item in References)
76+
{
77+
if (!string.IsNullOrEmpty(item.ItemSpec))
78+
{
79+
var path = Path.GetDirectoryName(Path.GetFullPath(item.ItemSpec));
80+
candidates[path] = path;
81+
}
82+
}
83+
var pathList = new object[candidates.Keys.Count];
84+
candidates.Keys.CopyTo(pathList, 0);
85+
CombinedReferencesBasePath = string.Join(";", pathList);
86+
]]>
87+
</Code>
88+
</Task>
89+
</UsingTask>
90+
91+
<UsingTask
92+
TaskName="_EB_CandidateToolingDir"
93+
TaskFactory="$(_EB_TaskFactory)"
94+
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
95+
<ParameterGroup>
96+
<ToolingDir ParameterType="Microsoft.Build.Framework.ITaskItem" Required="true" />
97+
<CandidateDir Output="true" />
98+
</ParameterGroup>
99+
<Task>
100+
<Using Namespace="System"/>
101+
<Using Namespace="System.IO"/>
102+
<Using Namespace="Microsoft.Build.Framework"/>
103+
<Code Type="Fragment" Language="cs">
104+
<![CDATA[
105+
string path = Path.GetFullPath(ToolingDir.ItemSpec);
106+
if (!Directory.Exists(path))
107+
{
108+
string basePath = Path.GetDirectoryName(path);
109+
path = Path.Combine(basePath, "net9.0");
110+
}
111+
CandidateDir = path;
112+
]]>
113+
</Code>
114+
</Task>
115+
</UsingTask>
116+
40117
</Project>

src/Epoxy.Build/build/Epoxy.Build.targets

+16-49
Original file line numberDiff line numberDiff line change
@@ -50,65 +50,32 @@
5050
</PropertyGroup>
5151

5252
<PropertyGroup>
53-
<_EB_ToolingDir>$([System.IO.Path]::Combine('$(_EB_ScriptBaseDir)','..','tools','$(_EB_PlatformName)'))</_EB_ToolingDir>
53+
<EpoxyBuildToolingDir>$([System.IO.Path]::Combine('$(_EB_ScriptBaseDir)','..','tools','$(_EB_PlatformName)'))</EpoxyBuildToolingDir>
5454
</PropertyGroup>
5555

56-
<!-- ======================== -->
57-
<!-- Custom task -->
58-
59-
<UsingTask
60-
TaskName="GetCombinedReferencesBasePath"
61-
TaskFactory="RoslynCodeTaskFactory"
62-
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
63-
<ParameterGroup>
64-
<References ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
65-
<CombinedReferencesBasePath Output="true" />
66-
</ParameterGroup>
67-
<Task>
68-
<Using Namespace="System"/>
69-
<Using Namespace="System.IO"/>
70-
<!-- HACK: Will cause compilation error by using `System.Collection.Generic` and/or `System.Linq` on MacOS
71-
(Maybe related both mono environment and unreferenced core assembly on `RoslynCodeTaskFactory`) -->
72-
<Using Namespace="System.Collections"/>
73-
<Using Namespace="Microsoft.Build.Framework"/>
74-
<Code Type="Fragment" Language="cs">
75-
<![CDATA[
76-
var candidates = new Hashtable();
77-
foreach (var item in References)
78-
{
79-
if (!string.IsNullOrEmpty(item.ItemSpec))
80-
{
81-
var path = Path.GetDirectoryName(Path.GetFullPath(item.ItemSpec));
82-
candidates[path] = path;
83-
}
84-
}
85-
var pathList = new object[candidates.Keys.Count];
86-
candidates.Keys.CopyTo(pathList, 0);
87-
CombinedReferencesBasePath = string.Join(";", pathList);
88-
]]>
89-
</Code>
90-
</Task>
91-
</UsingTask>
92-
9356
<!-- ======================== -->
9457
<!-- Build target -->
9558

9659
<Target Name="EpoxyBuild" AfterTargets="AfterCompile"
9760
Condition="'$(EpoxyBuildEnable)' == 'True'">
98-
61+
62+
<_EB_CandidateToolingDir ToolingDir="$(EpoxyBuildToolingDir)">
63+
<Output TaskParameter="CandidateDir" PropertyName="_EB_ToolingCandidateDir" />
64+
</_EB_CandidateToolingDir>
65+
9966
<PropertyGroup>
100-
<EpoxyBuildToolingRuntimeName Condition="'$(EpoxyBuildToolingRuntimeName)' == ''">$(_EB_RuntimeName)</EpoxyBuildToolingRuntimeName>
101-
<EpoxyBuildToolingDir Condition="'$(EpoxyBuildToolingDir)' == ''">$([System.IO.Path]::GetFullPath('$(_EB_ToolingDir)'))</EpoxyBuildToolingDir>
102-
<EpoxyBuildToolingPath Condition="'$(EpoxyBuildToolingPath)' == ''">$([System.IO.Path]::Combine('$(EpoxyBuildToolingDir)','$(_EB_ExecutableName)'))</EpoxyBuildToolingPath>
103-
<EpoxyBuildToolingTraceOption Condition="$(EpoxyBuildTrace)"> -t</EpoxyBuildToolingTraceOption>
104-
<EpoxyBuildToolingDebugOption Condition="$(EpoxyBuildDebug)"> -d</EpoxyBuildToolingDebugOption>
67+
<_EB_ToolingRuntimeName Condition="'$(_EB_ToolingRuntimeName)' == ''">$(_EB_RuntimeName)</_EB_ToolingRuntimeName>
68+
<_EB_ToolingDir Condition="'$(_EB_ToolingDir)' == ''">$(_EB_ToolingCandidateDir)</_EB_ToolingDir>
69+
<_EB_ToolingPath Condition="'$(_EB_ToolingPath)' == ''">$([System.IO.Path]::Combine('$(_EB_ToolingDir)','$(_EB_ExecutableName)'))</_EB_ToolingPath>
70+
<_EB_ToolingTraceOption Condition="'$(EpoxyBuildTrace)' == 'True'"> -t</_EB_ToolingTraceOption>
71+
<_EB_ToolingDebugOption Condition="'$(EpoxyBuildDebug)' == 'True'"> -d</_EB_ToolingDebugOption>
10572
</PropertyGroup>
10673

107-
<GetCombinedReferencesBasePath References="@(ReferencePath)">
108-
<Output TaskParameter="CombinedReferencesBasePath" PropertyName="CombinedReferencesBasePath" />
109-
</GetCombinedReferencesBasePath>
74+
<_EB_GetCombinedReferencesBasePath References="@(ReferencePath)">
75+
<Output TaskParameter="CombinedReferencesBasePath" PropertyName="_EB_CombinedReferencesBasePath" />
76+
</_EB_GetCombinedReferencesBasePath>
11077

111-
<Exec WorkingDirectory="$(EpoxyBuildToolingDir)"
112-
Command="$(EpoxyBuildToolingRuntimeName)&quot;$(EpoxyBuildToolingPath)&quot;$(EpoxyBuildToolingTraceOption)$(EpoxyBuildToolingDebugOption) &quot;$(CombinedReferencesBasePath)&quot; &quot;$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)&quot;" />
78+
<Exec WorkingDirectory="$(_EB_ToolingDir)"
79+
Command="$(_EB_ToolingRuntimeName)&quot;$(_EB_ToolingPath)&quot;$(_EB_ToolingTraceOption)$(_EB_ToolingDebugOption) &quot;$(_EB_CombinedReferencesBasePath)&quot; &quot;$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)&quot;" />
11380
</Target>
11481
</Project>

0 commit comments

Comments
 (0)