diff --git a/Directory.Build.props b/Directory.Build.props index ba77147950ec4a..0d6a0dd4bebb61 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -138,6 +138,7 @@ $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasm')) $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasi')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)', 'publish')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MobileBuildTasks', '$(TasksConfiguration)', '$(NetCoreAppToolCurrent)')) diff --git a/eng/Subsets.props b/eng/Subsets.props index 2b9028d5df1d61..cbc4aa41982afd 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -484,7 +484,7 @@ - + diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 2eab0816071b96..c6797859525e8a 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -20,7 +20,7 @@ $(BaseIntermediateOutputPath)$(Configuration)\ $(BaseIntermediateOutputPath)$(TargetOS).$(TargetArchitecture).$(Configuration)\ $(MSBuildThisFileDirectory) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)')) + $(CoreclrRuntimeBinDir) false false diff --git a/src/tests/Common/Directory.Build.targets b/src/tests/Common/Directory.Build.targets index bcf73b63a86bcc..8190dabe61532c 100644 --- a/src/tests/Common/Directory.Build.targets +++ b/src/tests/Common/Directory.Build.targets @@ -123,6 +123,11 @@ + + + + True + diff --git a/src/tools/Directory.Build.targets b/src/tools/Directory.Build.targets new file mode 100644 index 00000000000000..b84d4b3afe1bf2 --- /dev/null +++ b/src/tools/Directory.Build.targets @@ -0,0 +1,11 @@ + + + + true + + + + + + + diff --git a/src/tools/ilasm/src/ilasm/ilasm.csproj b/src/tools/ilasm/src/ilasm/ilasm.csproj index c05ace9109a811..1ed88edd74622d 100644 --- a/src/tools/ilasm/src/ilasm/ilasm.csproj +++ b/src/tools/ilasm/src/ilasm/ilasm.csproj @@ -1,11 +1,25 @@ - + Exe $(NetCoreAppToolCurrent) + $(PortableTargetRid) + $(CoreclrRuntimeBinDir)managed-ilasm + false + false + true + true + true + true + true + + + false enable + +