From 84321ca743dca5932ca536d41b3f778f8ef9f692 Mon Sep 17 00:00:00 2001
From: Lamparter <71598437+Lamparter@users.noreply.github.com>
Date: Wed, 27 Nov 2024 18:02:29 +0000
Subject: [PATCH] Move `utils` to `eng`

---
 Build.proj                                          |   4 ++--
 Directory.Build.props                               |   4 ++--
 {utils => eng/utils}/NuGet/nuget.exe                | Bin
 .../References/IKVM/IKVM.Reflection.License.txt     |   0
 .../utils}/References/IKVM/IKVM.Reflection.dll      | Bin
 {utils => eng/utils}/References/Mono.Posix.dll      | Bin
 .../IronPython.Modules/IronPython.Modules.csproj    |   2 +-
 src/core/IronPython/IronPython.csproj               |   2 +-
 .../IronPython.Compiler/IronPython.Compiler.csproj  |   4 ++--
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename {utils => eng/utils}/NuGet/nuget.exe (100%)
 rename {utils => eng/utils}/References/IKVM/IKVM.Reflection.License.txt (100%)
 rename {utils => eng/utils}/References/IKVM/IKVM.Reflection.dll (100%)
 rename {utils => eng/utils}/References/Mono.Posix.dll (100%)

diff --git a/Build.proj b/Build.proj
index 8554e497d..30d3fd487 100644
--- a/Build.proj
+++ b/Build.proj
@@ -9,8 +9,8 @@
 
     <RootDir>$(MSBuildThisFileDirectory)</RootDir>
     <Solution>$(RootDir)IronPython.sln</Solution>
-    <UtilDir>$(RootDir)utils</UtilDir>
-    <ReferenceDir>$(RootDir)utils\References</ReferenceDir>
+    <UtilDir>$(RootDir)eng\utils</UtilDir>
+    <ReferenceDir>$(RootDir)eng\utils\References</ReferenceDir>
     <BinDir>$(RootDir)bin</BinDir>
     <BuildSysDir>$(RootDir)eng</BuildSysDir>
   </PropertyGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index ab7ff87de..89ac1857d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,10 +6,10 @@
     <!-- These are normally set by Build.proj, except when building from VS. -->
     <RootDir Condition=" '$(RootDir)' == '' ">$(MSBuildThisFileDirectory)</RootDir>
     <BuildSysDir Condition=" '$(BuildSysDir)' == '' ">$(RootDir)eng</BuildSysDir>
-    <ReferenceDir Condition=" '$(ReferenceDir)' == '' ">$(RootDir)utils\References</ReferenceDir>
+    <ReferenceDir Condition=" '$(ReferenceDir)' == '' ">$(RootDir)eng\utils\References</ReferenceDir>
 
     <Mono Condition=" '$(Mono)' == '' AND '$(MSBuildRuntimeType)' == 'Mono' ">true</Mono>
-    
+
     <!-- The following two lines prevent csc.rsp and Microsoft.NETFramework.props from adding
          additional assembly references. -->
     <NoConfig>true</NoConfig>
diff --git a/utils/NuGet/nuget.exe b/eng/utils/NuGet/nuget.exe
similarity index 100%
rename from utils/NuGet/nuget.exe
rename to eng/utils/NuGet/nuget.exe
diff --git a/utils/References/IKVM/IKVM.Reflection.License.txt b/eng/utils/References/IKVM/IKVM.Reflection.License.txt
similarity index 100%
rename from utils/References/IKVM/IKVM.Reflection.License.txt
rename to eng/utils/References/IKVM/IKVM.Reflection.License.txt
diff --git a/utils/References/IKVM/IKVM.Reflection.dll b/eng/utils/References/IKVM/IKVM.Reflection.dll
similarity index 100%
rename from utils/References/IKVM/IKVM.Reflection.dll
rename to eng/utils/References/IKVM/IKVM.Reflection.dll
diff --git a/utils/References/Mono.Posix.dll b/eng/utils/References/Mono.Posix.dll
similarity index 100%
rename from utils/References/Mono.Posix.dll
rename to eng/utils/References/Mono.Posix.dll
diff --git a/src/core/IronPython.Modules/IronPython.Modules.csproj b/src/core/IronPython.Modules/IronPython.Modules.csproj
index e6baefc59..bbdf32345 100644
--- a/src/core/IronPython.Modules/IronPython.Modules.csproj
+++ b/src/core/IronPython.Modules/IronPython.Modules.csproj
@@ -10,7 +10,7 @@
   <ItemGroup Condition=" '$(IsFullFramework)' == 'true' ">
     <Reference Include="Mono.Posix" Version="4.0.0">
       <Private>True</Private>
-      <HintPath>..\..\..\utils\References\Mono.Posix.dll</HintPath>
+      <HintPath>..\..\..\eng\utils\References\Mono.Posix.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition=" '$(IsFullFramework)' != 'true' ">
diff --git a/src/core/IronPython/IronPython.csproj b/src/core/IronPython/IronPython.csproj
index c5e954dac..4e2918ab2 100644
--- a/src/core/IronPython/IronPython.csproj
+++ b/src/core/IronPython/IronPython.csproj
@@ -23,7 +23,7 @@
   <ItemGroup Condition=" '$(IsFullFramework)' == 'true' ">
     <Reference Include="Mono.Posix" Version="4.0.0">
       <Private>True</Private>
-      <HintPath>..\..\..\utils\References\Mono.Posix.dll</HintPath>
+      <HintPath>..\..\..\eng\utils\References\Mono.Posix.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition=" '$(IsFullFramework)' != 'true' ">
diff --git a/src/platforms/IronPython.Compiler/IronPython.Compiler.csproj b/src/platforms/IronPython.Compiler/IronPython.Compiler.csproj
index 6a0776309..f053ca71e 100644
--- a/src/platforms/IronPython.Compiler/IronPython.Compiler.csproj
+++ b/src/platforms/IronPython.Compiler/IronPython.Compiler.csproj
@@ -15,12 +15,12 @@
 
   <ItemGroup>
     <StageItem Include="$(TargetDir)\IKVM.Reflection.dll" />
-    <StageItem Include="$(RootDir)utils\References\IKVM\IKVM.Reflection.License.txt" />
+    <StageItem Include="$(RootDir)eng\utils\References\IKVM\IKVM.Reflection.License.txt" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="IKVM.Reflection" CopyLocal="true">
-      <HintPath>..\..\..\utils\References\IKVM\IKVM.Reflection.dll</HintPath>
+      <HintPath>..\..\..\eng\utils\References\IKVM\IKVM.Reflection.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>